2004-11-09 [colin] 0.9.12cvs144.1

[claws.git] / src / prefs_account.h

diff --git a/src/prefs_account.h b/src/prefs_account.h
index ddeb1beb2ff30b93c6e65ac5c2ba6042b8932072..09d09a698b717da5cea587f28f4b4007fd11b06a 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,19 +42,10 @@ typedef enum {
        SIG_DIRECT
 } SigType;
 
+#include <glib.h>
 
-#if USE_GPGME
-typedef enum {
-       SIGN_KEY_DEFAULT,
-       SIGN_KEY_BY_FROM,
-       SIGN_KEY_CUSTOM
-} SignKeyType;
-
-typedef enum {
-       GNUPG_MODE_DETACH,
-       GNUPG_MODE_INLINE
-} DefaultGnuPGMode;
-#endif /* USE_GPGME */
+#include "smtp.h"
+#include "folder.h"
 
 struct _PrefsAccount
 {
@@ -92,6 +75,7 @@ struct _PrefsAccount
        SSLType ssl_imap;
        SSLType ssl_nntp;
        SSLType ssl_smtp;
+       gboolean use_nonblocking_ssl;
 #endif /* USE_OPENSSL */
 
        /* Temporarily preserved password */
@@ -142,14 +126,10 @@ struct _PrefsAccount
        gboolean  set_autoreplyto;
        gchar    *auto_replyto;
 
-#if USE_GPGME
        /* Privacy */
-       gboolean default_encrypt;
-       gboolean default_sign;
-       gboolean default_gnupg_mode;
-       SignKeyType sign_key;
-       gchar *sign_key_id;
-#endif /* USE_GPGME */
+       gchar    *default_privacy_system;
+       gboolean  default_encrypt;
+       gboolean  default_sign;
 
        /* Advanced */
        gboolean  set_smtpport;
@@ -190,14 +170,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);