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 1f6f0f9796e2178be14fdb94adab505bb6012f1f..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-2002 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,38 +24,23 @@
 #  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 {
-       /* 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,
-} Pop3SessionType;
+       SIG_FILE,
+       SIG_COMMAND,
+       SIG_DIRECT
+} SigType;
 
 #if USE_GPGME
 typedef enum {
@@ -63,8 +48,18 @@ typedef enum {
        SIGN_KEY_BY_FROM,
        SIGN_KEY_CUSTOM
 } SignKeyType;
+
+typedef enum {
+       GNUPG_MODE_DETACH,
+       GNUPG_MODE_INLINE
+} DefaultGnuPGMode;
 #endif /* USE_GPGME */
 
+#include <glib.h>
+
+#include "smtp.h"
+#include "folder.h"
+
 struct _PrefsAccount
 {
        gchar *account_name;
@@ -80,6 +75,7 @@ struct _PrefsAccount
        gchar *smtp_server;
        gchar *nntp_server;
        gboolean use_nntp_auth;
+       gboolean use_nntp_auth_onconnect;
        gchar *userid;
        gchar *passwd;
 
@@ -87,12 +83,13 @@ struct _PrefsAccount
        gboolean use_mail_command;
        gchar * mail_command;
 
-#if USE_SSL
+#if USE_OPENSSL
        SSLType ssl_pop;
        SSLType ssl_imap;
        SSLType ssl_nntp;
        SSLType ssl_smtp;
-#endif /* USE_SSL */
+       gboolean use_nonblocking_ssl;
+#endif /* USE_OPENSSL */
 
        /* Temporarily preserved password */
        gchar *tmp_pass;
@@ -108,33 +105,33 @@ struct _PrefsAccount
        gint size_limit;
        gboolean filter_on_recv;
        gchar *inbox;
+       gint max_articles;
 
-       /* selective Download */
-       gint   session;
-       GSList *msg_list;
+       gint imap_auth_type;
 
        /* Send */
        gboolean add_date;
        gboolean gen_msgid;
        gboolean add_customhdr;
        gboolean use_smtp_auth;
+       SMTPAuthType smtp_auth_type;
        gchar *smtp_userid;
        gchar *smtp_passwd;
 
-       /* CLAWS: SMTP AUTH */
-       gboolean smtp_auth_enable_login;
-       gboolean smtp_auth_enable_cram_md5;
-       gboolean smtp_auth_enable_digest_md5;
-
        /* Temporarily preserved password */
        gchar *tmp_smtp_pass;
 
        gboolean pop_before_smtp;
+       gint pop_before_smtp_timeout;
+       time_t last_pop_login_time;
 
        GSList *customhdr_list;
 
        /* Compose */
-       gchar *sig_path;
+       SigType sig_type;
+       gchar    *sig_path;
+       gboolean  auto_sig;
+       gchar    *sig_sep;
        gboolean  set_autocc;
        gchar    *auto_cc;
        gboolean  set_autobcc;
@@ -145,8 +142,8 @@ struct _PrefsAccount
 #if USE_GPGME
        /* Privacy */
        gboolean default_encrypt;
-       gboolean ascii_armored;
        gboolean default_sign;
+       gboolean default_gnupg_mode;
        SignKeyType sign_key;
        gchar *sign_key_id;
 #endif /* USE_GPGME */
@@ -190,14 +187,17 @@ 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         (PrefsAccount   *ac_prefs);
-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);
+
 PrefsAccount *prefs_account_open       (PrefsAccount   *ac_prefs);
 
 #endif /* __PREFS_ACCOUNT_H__ */