sync with 0.8.10cvs20

[claws.git] / src / prefs_account.h

diff --git a/src/prefs_account.h b/src/prefs_account.h
index 35d91361f9e5c44d692f6ddcf62eb0f0af1ba004..c5eae9a9ef99eb3f00b0d1054dcdaed515cccce5 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-2003 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
@@ -44,6 +44,12 @@ typedef enum {
        A_LOCAL
 } RecvProtocol;
 
+typedef enum {
+       SIG_FILE,
+       SIG_COMMAND,
+       SIG_DIRECT
+} SigType;
+
 typedef enum {
        /* login and retrieve messages, as before */
        STYPE_NORMAL,
@@ -65,6 +71,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
@@ -82,6 +93,7 @@ struct _PrefsAccount
        gchar *smtp_server;
        gchar *nntp_server;
        gboolean use_nntp_auth;
+       gboolean use_nntp_auth_onconnect;
        gchar *userid;
        gchar *passwd;
 
@@ -89,12 +101,12 @@ 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 */
+#endif /* USE_OPENSSL */
 
        /* Temporarily preserved password */
        gchar *tmp_pass;
@@ -110,6 +122,7 @@ struct _PrefsAccount
        gint size_limit;
        gboolean filter_on_recv;
        gchar *inbox;
+       gint max_articles;
 
        /* selective Download */
        gint   session;
@@ -134,7 +147,10 @@ struct _PrefsAccount
        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;
@@ -146,8 +162,7 @@ struct _PrefsAccount
        /* Privacy */
        gboolean default_encrypt;
        gboolean default_sign;
-       gboolean ascii_armored;
-       gboolean clearsign;
+       gboolean default_gnupg_mode;
        SignKeyType sign_key;
        gchar *sign_key_id;
 #endif /* USE_GPGME */