Make Message-ID string generation less confusing.

[claws.git] / src / prefs_account.h

diff --git a/src/prefs_account.h b/src/prefs_account.h
index 850aaeaa17b1dcc2ca3a13b5ad445d95aea8ed87..f7feb137f8683b3a13311542a67c55fc70c227b5 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-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -21,15 +21,13 @@
 #define PREFS_ACCOUNT_H
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#include "claws-features.h"
 #endif
 #include "ssl.h"
 typedef struct _PrefsAccount   PrefsAccount;
 
 typedef enum {
        A_POP3,
-       A_APOP, /* deprecated */
-       A_RPOP, /* deprecated */
        A_IMAP4,
        A_NNTP,
        A_LOCAL,
@@ -46,9 +44,10 @@ typedef enum {
 #include <glib.h>
 
 #include "smtp.h"
-#include "folder.h"
 #include "gtk/prefswindow.h"
 
+struct _Folder;
+
 /* Changes to this data structure might need to be reflected
  * in account_clone() */
 struct _PrefsAccount
@@ -85,11 +84,9 @@ struct _PrefsAccount
        gchar *in_ssl_client_cert_file;
        gchar *in_ssl_client_cert_pass;
 
+       gboolean ssl_certs_auto_accept;
        gboolean use_nonblocking_ssl;
 
-       /* Temporarily preserved password */
-       gchar *tmp_pass;
-
        /* Receive */
        gboolean use_apop_auth;
        gboolean rmmail;
@@ -107,8 +104,11 @@ struct _PrefsAccount
 
        gint imap_auth_type;
 
+       gboolean receive_in_progress;
+
        /* Send */
        gboolean gen_msgid;
+       gboolean gen_xmailer;
        gboolean add_customhdr;
        gboolean use_smtp_auth;
        SMTPAuthType smtp_auth_type;
@@ -116,9 +116,6 @@ struct _PrefsAccount
        gchar *smtp_passwd;
        gchar *session_smtp_passwd;
 
-       /* Temporarily preserved password */
-       gchar *tmp_smtp_pass;
-
        gboolean pop_before_smtp;
        gint pop_before_smtp_timeout;
        time_t last_pop_login_time;
@@ -170,6 +167,9 @@ struct _PrefsAccount
        gushort   nntpport;
        gboolean  set_domain;
        gchar    *domain;
+       gboolean  set_gnutls_priority;
+       gchar    *gnutls_priority;
+       gboolean  msgid_with_addr;
        gboolean  mark_crosspost_read;
        gint      crosspost_col;
 
@@ -204,7 +204,7 @@ struct _PrefsAccount
        /* Unique account ID */
        gint account_id;
 
-       Folder *folder;
+       struct _Folder *folder;
        GHashTable *privacy_prefs;
        SMTPSession *session;
 };
@@ -223,6 +223,7 @@ PrefsAccount *prefs_account_open    (PrefsAccount   *ac_prefs, gboolean *dirty);
 
 const gchar *prefs_account_get_privacy_prefs(PrefsAccount *account, gchar *id);
 void prefs_account_set_privacy_prefs(PrefsAccount *account, gchar *id, gchar *new_value);
+gchar *prefs_account_generate_msgid(PrefsAccount *account);
 
 void prefs_account_register_page       (PrefsPage      *page);
 void prefs_account_unregister_page     (PrefsPage      *page);