move signature settings to Account Prefs

[claws.git] / src / prefs_account.h

diff --git a/src/prefs_account.h b/src/prefs_account.h
index aff4dda8effaeac4713cbcc69fee1708d5d27e8c..99b719d5047a29480784be399f19a6b4fc6aba7f 100644 (file)
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -46,11 +46,17 @@ typedef enum {
 
 typedef enum {
        /* login and retrieve messages, as before */
-       RETR_NORMAL,
-       /* send TOP to server and retrieve Header */
-       RETR_HEADER, 
+       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 */
-       DELE_HEADER 
+       STYPE_DELETE, 
+       /* download + remove Mail from Server */
+       STYPE_DOWNLOAD,
+       /* just login (pop before smtp) */
+       STYPE_POP_BEFORE_SMTP,
 } Pop3SessionType;
 
 #if USE_GPGME
@@ -59,6 +65,11 @@ typedef enum {
        SIGN_KEY_BY_FROM,
        SIGN_KEY_CUSTOM
 } SignKeyType;
+
+typedef enum {
+       GNUPG_MODE_DETACH,
+       GNUPG_MODE_INLINE
+} DefaultGnuPGMode;
 #endif /* USE_GPGME */
 
 struct _PrefsAccount
@@ -76,6 +87,7 @@ struct _PrefsAccount
        gchar *smtp_server;
        gchar *nntp_server;
        gboolean use_nntp_auth;
+       gboolean use_nntp_auth_onconnect;
        gchar *userid;
        gchar *passwd;
 
@@ -83,38 +95,38 @@ struct _PrefsAccount
        gboolean use_mail_command;
        gchar * mail_command;
 
-#if USE_SSL
-       /* SSL */
-       gboolean ssl_pop;
-       gboolean ssl_imap;
-       gboolean ssl_nntp;
-       SSLSMTPType ssl_smtp;
-#endif /* USE_SSL */
+#if USE_OPENSSL
+       SSLType ssl_pop;
+       SSLType ssl_imap;
+       SSLType ssl_nntp;
+       SSLType ssl_smtp;
+#endif /* USE_OPENSSL */
 
        /* Temporarily preserved password */
        gchar *tmp_pass;
 
        /* Receive */
        gboolean rmmail;
-       gchar *leave_time;      
+       gint msg_leave_time;
        gboolean getall;
        gboolean recv_at_getall;
+       gboolean sd_rmmail_on_download;
+       gboolean sd_filter_on_recv;
        gboolean enable_size_limit;
        gint size_limit;
        gboolean filter_on_recv;
        gchar *inbox;
 
        /* selective Download */
-       gint   session_type;
-       GSList *to_delete;
-
-       gchar *imap_dir;
+       gint   session;
+       GSList *msg_list;
 
        /* Send */
        gboolean add_date;
        gboolean gen_msgid;
        gboolean add_customhdr;
        gboolean use_smtp_auth;
+       SMTPAuthType smtp_auth_type;
        gchar *smtp_userid;
        gchar *smtp_passwd;
 
@@ -122,11 +134,15 @@ struct _PrefsAccount
        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;
+       gchar    *sig_path;
+       gboolean  auto_sig;
+       gchar    *sig_sep;
        gboolean  set_autocc;
        gchar    *auto_cc;
        gboolean  set_autobcc;
@@ -137,8 +153,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 */
@@ -168,6 +184,15 @@ struct _PrefsAccount
        gboolean  set_tunnelcmd;
        gchar     *tunnelcmd;
 
+       gchar *imap_dir;
+
+       gboolean set_sent_folder;
+       gchar *sent_folder;
+       gboolean set_draft_folder;
+       gchar *draft_folder;
+       gboolean set_trash_folder;
+       gchar *trash_folder;
+
        /* Default or not */
        gboolean is_default;
        /* Unique account ID */
@@ -176,11 +201,14 @@ struct _PrefsAccount
        RemoteFolder *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_free                        (PrefsAccount   *ac_prefs);
+
 PrefsAccount *prefs_account_open       (PrefsAccount   *ac_prefs);
 
 #endif /* __PREFS_ACCOUNT_H__ */