2004-08-23 [colin] 0.9.12cvs77.2

[claws.git] / src / prefs_account.h

diff --git a/src/prefs_account.h b/src/prefs_account.h
index c5eae9a9ef99eb3f00b0d1054dcdaed515cccce5..10987599b003dd561d9c59741fd6436d854d0104 100644 (file)
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,24 +24,16 @@
 #  include "config.h"
 #endif
 
-#include <glib.h>
-
 typedef struct _PrefsAccount   PrefsAccount;
 
-#include "folder.h"
-#include "smtp.h"
-
-#ifdef USE_GPGME
-#  include "rfc2015.h"
-#endif
-
 typedef enum {
        A_POP3,
        A_APOP,
        A_RPOP,
        A_IMAP4,
        A_NNTP,
-       A_LOCAL
+       A_LOCAL,
+       A_NONE,         /* SMTP only */
 } RecvProtocol;
 
 typedef enum {
@@ -50,21 +42,6 @@ typedef enum {
        SIG_DIRECT
 } SigType;
 
-typedef enum {
-       /* login and retrieve messages, as before */
-       STYPE_NORMAL,
-       /* send TOP to server and retrieve all available Headers */
-       STYPE_PREVIEW_ALL,
-       /* send TOP to server and retrieve new Headers */
-       STYPE_PREVIEW_NEW,
-       /* delete selected Headers on Server */
-       STYPE_DELETE, 
-       /* download + remove Mail from Server */
-       STYPE_DOWNLOAD,
-       /* just login (pop before smtp) */
-       STYPE_POP_BEFORE_SMTP,
-} Pop3SessionType;
-
 #if USE_GPGME
 typedef enum {
        SIGN_KEY_DEFAULT,
@@ -78,6 +55,11 @@ typedef enum {
 } DefaultGnuPGMode;
 #endif /* USE_GPGME */
 
+#include <glib.h>
+
+#include "smtp.h"
+#include "folder.h"
+
 struct _PrefsAccount
 {
        gchar *account_name;
@@ -106,6 +88,7 @@ struct _PrefsAccount
        SSLType ssl_imap;
        SSLType ssl_nntp;
        SSLType ssl_smtp;
+       gboolean use_nonblocking_ssl;
 #endif /* USE_OPENSSL */
 
        /* Temporarily preserved password */
@@ -124,9 +107,7 @@ struct _PrefsAccount
        gchar *inbox;
        gint max_articles;
 
-       /* selective Download */
-       gint   session;
-       GSList *msg_list;
+       gint imap_auth_type;
 
        /* Send */
        gboolean add_date;
@@ -206,14 +187,14 @@ struct _PrefsAccount
        /* Unique account ID */
        gint account_id;
 
-       RemoteFolder *folder;
+       Folder *folder;
 };
 
 PrefsAccount *prefs_account_new                (void);
 
 void prefs_account_read_config         (PrefsAccount   *ac_prefs,
                                         const gchar    *label);
-void prefs_account_save_config_all     (GList          *account_list);
+void prefs_account_write_config_all    (GList          *account_list);
 
 void prefs_account_free                        (PrefsAccount   *ac_prefs);