2008-09-16 [colin] 3.5.0cvs109

[claws.git] / src / prefs_account.h

diff --git a/src/prefs_account.h b/src/prefs_account.h
index cba11291dcdd5bb7519fc3f0fbf258ea06a70d36..d000b20ac325df69e18f6330f37b02d4fb565b3c 100644 (file)
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -4,7 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifndef PREFS_ACCOUNT_H
@@ -49,6 +49,8 @@ typedef enum {
 #include "folder.h"
 #include "gtk/prefswindow.h"
 
+/* Changes to this data structure might need to be reflected
+ * in account_clone() */
 struct _PrefsAccount
 {
        gchar *account_name;
@@ -67,6 +69,7 @@ struct _PrefsAccount
        gboolean use_nntp_auth_onconnect;
        gchar *userid;
        gchar *passwd;
+       gchar *session_passwd;
 
        gchar * local_mbox;
        gboolean use_mail_command;
@@ -76,15 +79,19 @@ struct _PrefsAccount
        SSLType ssl_imap;
        SSLType ssl_nntp;
        SSLType ssl_smtp;
-       gboolean use_nonblocking_ssl;
+       
+       gchar *out_ssl_client_cert_file;
+       gchar *out_ssl_client_cert_pass;
+       gchar *in_ssl_client_cert_file;
+       gchar *in_ssl_client_cert_pass;
 
-       /* Temporarily preserved password */
-       gchar *tmp_pass;
+       gboolean use_nonblocking_ssl;
 
        /* Receive */
        gboolean use_apop_auth;
        gboolean rmmail;
        gint msg_leave_time;
+       gint msg_leave_hour;
        gboolean recv_at_getall;
        gboolean sd_rmmail_on_download;
        gboolean enable_size_limit;
@@ -104,9 +111,7 @@ struct _PrefsAccount
        SMTPAuthType smtp_auth_type;
        gchar *smtp_userid;
        gchar *smtp_passwd;
-
-       /* Temporarily preserved password */
-       gchar *tmp_smtp_pass;
+       gchar *session_smtp_passwd;
 
        gboolean pop_before_smtp;
        gint pop_before_smtp_timeout;
@@ -125,12 +130,10 @@ struct _PrefsAccount
        gchar    *auto_bcc;
        gboolean  set_autoreplyto;
        gchar    *auto_replyto;
-#ifdef USE_ASPELL
        gboolean  enable_default_dictionary;
        gchar    *default_dictionary;
        gboolean  enable_default_alt_dictionary;
        gchar    *default_alt_dictionary;
-#endif
        gboolean  compose_with_format;
        gchar    *compose_subject_format;
        gchar    *compose_body_format;
@@ -146,6 +149,7 @@ struct _PrefsAccount
        gboolean  default_encrypt;
        gboolean  default_encrypt_reply;
        gboolean  default_sign;
+       gboolean  default_sign_reply;
        gboolean  save_encrypted_as_clear_text;
        gboolean  encrypt_to_self;
 
@@ -163,6 +167,7 @@ struct _PrefsAccount
        gboolean  mark_crosspost_read;
        gint      crosspost_col;
 
+#ifndef G_OS_WIN32
        /* Use this command to open a socket, rather than doing so
         * directly.  Good if you want to perhaps use a special socks
         * tunnel command, or run IMAP-over-SSH.  In this case the
@@ -173,6 +178,7 @@ struct _PrefsAccount
         * as a particular user. */
        gboolean  set_tunnelcmd;
        gchar     *tunnelcmd;
+#endif
 
        gchar *imap_dir;
        gboolean imap_subsonly;