Fix bug #3342 ‘"Automatically accept unknown valid SSL certificates" is unfortunate...
[claws.git] / src / prefs_account.c
index 81b35188a95eaffdff212b54fee72b9855642a4f..62507bbcc0a9de9536d4c70eb5d47d99846fc3b8 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 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
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -34,7 +34,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#if !GTK_CHECK_VERSION(3, 0, 0)
 #include "gtkcmoptionmenu.h"
+#endif
 #include "main.h"
 #include "prefs_gtk.h"
 #include "prefs_account.h"
@@ -43,6 +45,7 @@
 #include "account.h"
 #include "mainwindow.h"
 #include "manage_window.h"
+#include "folder.h"
 #include "foldersel.h"
 #include "inc.h"
 #include "menu.h"
 #include "smtp.h"
 #include "imap.h"
 #include "remotefolder.h"
-#include "base64.h"
 #include "combobox.h"
 #include "setup.h"
 #include "quote_fmt.h"
 #include "hooks.h"
+#include "privacy.h"
 #include "inputdialog.h"
 #include "ssl_certificate.h"
 
@@ -114,6 +117,9 @@ typedef struct BasicPage
        GtkWidget *pass_label;
        GtkWidget *uid_entry;
        GtkWidget *pass_entry;
+       GtkWidget *auto_configure_btn;
+       GtkWidget *auto_configure_cancel_btn;
+       GtkWidget *auto_configure_lbl;
 } BasicPage;
 
 typedef struct ReceivePage
@@ -152,7 +158,7 @@ typedef struct ReceivePage
        GtkWidget *frame_maxarticle;
        GtkWidget *maxarticle_label;
        GtkWidget *maxarticle_spinbtn;
-       GtkObject *maxarticle_spinbtn_adj;
+       GtkAdjustment *maxarticle_spinbtn_adj;
 } ReceivePage;
 
 typedef struct SendPage
@@ -162,7 +168,9 @@ typedef struct SendPage
     GtkWidget *vbox;
 
        GtkWidget *msgid_checkbtn;
+       GtkWidget *xmailer_checkbtn;
        GtkWidget *customhdr_checkbtn;
+       GtkWidget *msgid_with_addr_checkbtn;
        GtkWidget *smtp_auth_checkbtn;
        GtkWidget *smtp_auth_type_optmenu;
        GtkWidget *smtp_uid_entry;
@@ -259,6 +267,7 @@ typedef struct SSLPage
        GtkWidget *entry_out_cert_file;
        GtkWidget *entry_out_cert_pass;
 
+       GtkWidget *ssl_certs_auto_accept_checkbtn;
        GtkWidget *use_nonblocking_ssl_checkbtn;
 } SSLPage;
 
@@ -281,9 +290,10 @@ typedef struct AdvancedPage
        GtkWidget *nntpport_spinbtn;
        GtkWidget *domain_checkbtn;
        GtkWidget *domain_entry;
-       GtkWidget *msgid_with_addr_checkbtn;
+#if !GTK_CHECK_VERSION(3, 0, 0)
        GtkWidget *crosspost_checkbtn;
        GtkWidget *crosspost_colormenu;
+#endif
 
 #ifndef G_OS_WIN32
        GtkWidget *tunnelcmd_checkbtn;
@@ -348,9 +358,11 @@ static void prefs_account_smtp_auth_type_set_optmenu       (PrefParam *pparam);
 static void prefs_account_enum_set_data_from_radiobtn  (PrefParam *pparam);
 static void prefs_account_enum_set_radiobtn            (PrefParam *pparam);
 
+#if !GTK_CHECK_VERSION(3, 0, 0)
 static void crosspost_color_toggled(void);
 static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam);
 static void prefs_account_crosspost_set_colormenu(PrefParam *pparam);
+#endif
 
 static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
                                           gpointer user_data);
@@ -500,11 +512,19 @@ static PrefParam send_param[] = {
         &send_page.msgid_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
+       {"generate_xmailer", "TRUE", &tmp_ac_prefs.gen_xmailer, P_BOOL,
+        &send_page.xmailer_checkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        {"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL,
         &send_page.customhdr_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
+       {"msgid_with_addr", "FALSE", &tmp_ac_prefs.msgid_with_addr, P_BOOL,
+        &send_page.msgid_with_addr_checkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
+        {"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
         &send_page.smtp_auth_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
@@ -662,11 +682,16 @@ static PrefParam privacy_param[] = {
        {"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
         &privacy_page.default_sign_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
-
+#ifdef G_OS_UNIX
        {"default_sign_reply", "TRUE", &tmp_ac_prefs.default_sign_reply, P_BOOL,
         &privacy_page.default_sign_reply_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
-
+#else
+       /* Bug 2367: disturbing for Win32 users with no keypair */
+       {"default_sign_reply", "FALSE", &tmp_ac_prefs.default_sign_reply, P_BOOL,
+        &privacy_page.default_sign_reply_checkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+#endif
        {"save_clear_text", "FALSE", &tmp_ac_prefs.save_encrypted_as_clear_text, P_BOOL,
         &privacy_page.save_clear_text_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -703,6 +728,10 @@ static PrefParam ssl_param[] = {
         prefs_account_enum_set_data_from_radiobtn,
         prefs_account_enum_set_radiobtn},
 
+       {"ssl_certs_auto_accept", "0", &tmp_ac_prefs.ssl_certs_auto_accept, P_BOOL,
+        &ssl_page.ssl_certs_auto_accept_checkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
         &ssl_page.use_nonblocking_ssl_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -743,6 +772,9 @@ static PrefParam ssl_param[] = {
        {"out_ssl_client_cert_pass", "", &tmp_ac_prefs.out_ssl_client_cert_pass, P_PASSWORD,
         NULL, NULL, NULL},
 
+       {"ssl_certs_auto_accept", "0", &tmp_ac_prefs.ssl_certs_auto_accept, P_BOOL,
+        NULL, NULL, NULL},
+
        {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
         NULL, NULL, NULL},
 #endif /* USE_GNUTLS */
@@ -791,9 +823,14 @@ static PrefParam advanced_param[] = {
         &advanced_page.domain_entry,
         prefs_set_data_from_entry, prefs_set_entry},
 
-       {"msgid_with_addr", "FALSE", &tmp_ac_prefs.msgid_with_addr, P_BOOL,
-        &advanced_page.msgid_with_addr_checkbtn,
-        prefs_set_data_from_toggle, prefs_set_toggle},
+#ifdef USE_GNUTLS
+       {"gnutls_set_priority", "FALSE", &tmp_ac_prefs.set_gnutls_priority, P_BOOL,
+        NULL, NULL, NULL},
+
+       {"gnutls_priority", NULL, &tmp_ac_prefs.gnutls_priority, P_STRING,
+        NULL, NULL, NULL},
+#endif
+
 #ifndef G_OS_WIN32
        {"set_tunnelcmd", "FALSE", &tmp_ac_prefs.set_tunnelcmd, P_BOOL,
         &advanced_page.tunnelcmd_checkbtn,
@@ -803,6 +840,7 @@ static PrefParam advanced_param[] = {
         &advanced_page.tunnelcmd_entry,
         prefs_set_data_from_entry, prefs_set_entry},
 #endif
+#if !GTK_CHECK_VERSION(3, 0, 0)
        {"mark_crosspost_read", "FALSE", &tmp_ac_prefs.mark_crosspost_read, P_BOOL,
         &advanced_page.crosspost_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -811,6 +849,7 @@ static PrefParam advanced_param[] = {
         &advanced_page.crosspost_colormenu,
         prefs_account_crosspost_set_data_from_colormenu,
         prefs_account_crosspost_set_colormenu},
+#endif
 
        {"set_sent_folder", "FALSE", &tmp_ac_prefs.set_sent_folder, P_BOOL,
         &advanced_page.sent_folder_checkbtn,
@@ -874,6 +913,11 @@ static void prefs_account_signature_edit_cb        (GtkWidget      *widget,
 static void pop_bfr_smtp_tm_set_sens           (GtkWidget      *widget,
                                                 gpointer        data);
 
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+static void auto_configure_cb                  (GtkWidget      *widget,
+                                                gpointer        data);
+
+#endif
 static void prefs_account_edit_custom_header   (void);
 
 
@@ -883,25 +927,6 @@ static void prefs_account_edit_custom_header       (void);
  * system choice. */
 static void privacy_system_activated(GtkWidget *combobox)
 {
-       const gchar *system_id;
-       gboolean privacy_enabled = FALSE;
-       gint privacy_enabled_int;
-       GtkTreeIter iter;
-       GtkListStore *menu = GTK_LIST_STORE(gtk_combo_box_get_model(
-                               GTK_COMBO_BOX(combobox)));
-
-       gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combobox), &iter);
-
-       gtk_tree_model_get(GTK_TREE_MODEL(menu), &iter,
-                       COMBOBOX_PRIVACY_PLUGIN_ID, &system_id,
-                       COMBOBOX_DATA, &privacy_enabled_int,
-                       -1);
-       
-       privacy_enabled = strcmp(system_id, "");
-
-       if( privacy_enabled_int == 0 )
-               privacy_enabled = FALSE;
-
        gtk_widget_set_sensitive (privacy_page.save_clear_text_checkbtn, 
                !gtk_toggle_button_get_active(
                                GTK_TOGGLE_BUTTON(privacy_page.encrypt_to_self_checkbtn)));
@@ -988,6 +1013,9 @@ static void basic_create_widget_func(PrefsPage * _page,
        GtkWidget *pass_label;
        GtkWidget *uid_entry;
        GtkWidget *pass_entry;
+       GtkWidget *auto_configure_btn;
+       GtkWidget *auto_configure_cancel_btn;
+       GtkWidget *auto_configure_lbl;
        GtkListStore *menu;
        GtkTreeIter iter;
 
@@ -1097,6 +1125,22 @@ static void basic_create_widget_func(PrefsPage * _page,
        gtk_label_set_justify(GTK_LABEL(optlabel), GTK_JUSTIFY_CENTER);
        gtk_box_pack_start(GTK_BOX (optmenubox), optlabel, FALSE, FALSE, 0);
 
+       auto_configure_btn = gtk_button_new_with_label(_("Auto-configure"));
+       gtk_box_pack_start(GTK_BOX (optmenubox), auto_configure_btn, FALSE, FALSE, 0);
+       auto_configure_cancel_btn = gtk_button_new_with_label(_("Cancel"));
+       gtk_box_pack_start(GTK_BOX (optmenubox), auto_configure_cancel_btn, FALSE, FALSE, 0);
+       auto_configure_lbl = gtk_label_new("");
+       gtk_label_set_justify(GTK_LABEL(auto_configure_lbl), GTK_JUSTIFY_LEFT);
+       gtk_box_pack_start(GTK_BOX (optmenubox), auto_configure_lbl, FALSE, FALSE, 0);
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+       gtk_widget_show(auto_configure_btn);
+       gtk_widget_show(auto_configure_lbl);
+       g_signal_connect (G_OBJECT (auto_configure_btn), "clicked",
+                         G_CALLBACK (auto_configure_cb), NULL);
+       g_signal_connect (G_OBJECT (auto_configure_cancel_btn), "clicked",
+                         G_CALLBACK (auto_configure_cb), NULL);
+#endif
+
        no_imap_warn_icon = gtk_image_new_from_stock
                         (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
        no_imap_warn_label = gtk_label_new(_("<span weight=\"bold\">Warning: this version of Claws Mail\n"
@@ -1188,10 +1232,6 @@ static void basic_create_widget_func(PrefsPage * _page,
                          GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
 #endif
        gtk_entry_set_visibility (GTK_ENTRY (pass_entry), FALSE);
-#ifdef MAEMO
-       hildon_gtk_entry_set_input_mode(GTK_ENTRY(pass_entry), 
-               HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
-#endif
 
        nntpserv_label = gtk_label_new (_("News server"));
        gtk_widget_show (nntpserv_label);
@@ -1285,6 +1325,9 @@ static void basic_create_widget_func(PrefsPage * _page,
        page->pass_label       = pass_label;
        page->uid_entry        = uid_entry;
        page->pass_entry       = pass_entry;
+       page->auto_configure_btn = auto_configure_btn;
+       page->auto_configure_cancel_btn = auto_configure_cancel_btn;
+       page->auto_configure_lbl = auto_configure_lbl;
 
        if (new_account) {
                PrefsAccount *def_ac;
@@ -1371,8 +1414,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        GtkWidget *frame2;
        GtkWidget *maxarticle_label;
        GtkWidget *maxarticle_spinbtn;
-       GtkObject *maxarticle_spinbtn_adj;
-       CLAWS_TIP_DECL();
+       GtkAdjustment *maxarticle_spinbtn_adj;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -1505,7 +1547,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_label, FALSE, FALSE, 0);
 
        maxarticle_spinbtn_adj =
-               gtk_adjustment_new (300, 0, 10000, 10, 100, 0);
+               GTK_ADJUSTMENT(gtk_adjustment_new (300, 0, 10000, 10, 100, 0));
        maxarticle_spinbtn = gtk_spin_button_new
                (GTK_ADJUSTMENT (maxarticle_spinbtn_adj), 10, 0);
        gtk_widget_show (maxarticle_spinbtn);
@@ -1540,6 +1582,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        COMBOBOX_ADD (menu, "ANONYMOUS", IMAP_AUTH_ANON);
        COMBOBOX_ADD (menu, "GSSAPI", IMAP_AUTH_GSSAPI);
        COMBOBOX_ADD (menu, "DIGEST-MD5", IMAP_AUTH_DIGEST_MD5);
+       COMBOBOX_ADD (menu, "SCRAM-SHA-1", IMAP_AUTH_SCRAM_SHA1);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -1646,9 +1689,11 @@ static void send_create_widget_func(PrefsPage * _page,
        GtkWidget *vbox2;
        GtkWidget *frame;
        GtkWidget *msgid_checkbtn;
+       GtkWidget *xmailer_checkbtn;
        GtkWidget *hbox;
        GtkWidget *customhdr_checkbtn;
        GtkWidget *customhdr_edit_btn;
+       GtkWidget *checkbtn_msgid_with_addr;
        GtkWidget *vbox3;
        GtkWidget *smtp_auth_checkbtn;
        GtkWidget *optmenu;
@@ -1673,6 +1718,12 @@ static void send_create_widget_func(PrefsPage * _page,
 
        PACK_CHECK_BUTTON (vbox2, msgid_checkbtn, _("Generate Message-ID"));
 
+       PACK_CHECK_BUTTON (vbox2, checkbtn_msgid_with_addr,
+                          _("Send account mail address in Message-ID"));
+
+       PACK_CHECK_BUTTON (vbox2, xmailer_checkbtn,
+                          _("Add user agent header"));
+
        hbox = gtk_hbox_new (FALSE, 12);
        gtk_widget_show (hbox);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
@@ -1766,10 +1817,6 @@ static void send_create_widget_func(PrefsPage * _page,
        gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0);
 
        gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE);
-#ifdef MAEMO
-       hildon_gtk_entry_set_input_mode(GTK_ENTRY(smtp_pass_entry), 
-               HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
-#endif
        PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
 
        hbox = gtk_hbox_new (FALSE, 8);
@@ -1821,7 +1868,9 @@ static void send_create_widget_func(PrefsPage * _page,
        gtk_box_pack_start (GTK_BOX (hbox), pop_auth_minutes_lbl, FALSE, FALSE, 0);
        
        page->msgid_checkbtn     = msgid_checkbtn;
+       page->xmailer_checkbtn   = xmailer_checkbtn;
        page->customhdr_checkbtn = customhdr_checkbtn;
+       page->msgid_with_addr_checkbtn  = checkbtn_msgid_with_addr;
 
        page->smtp_auth_checkbtn       = smtp_auth_checkbtn;
        page->smtp_auth_type_optmenu = optmenu;
@@ -2371,11 +2420,11 @@ static void ssl_create_widget_func(PrefsPage * _page,
        GtkWidget *entry_out_cert_pass;
 
        GtkWidget *vbox7;
+       GtkWidget *ssl_certs_auto_accept_checkbtn;
        GtkWidget *use_nonblocking_ssl_checkbtn;
        GtkWidget *hbox;
        GtkWidget *hbox_spc;
        GtkWidget *label;
-       CLAWS_TIP_DECL();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -2504,6 +2553,9 @@ static void ssl_create_widget_func(PrefsPage * _page,
        gtk_widget_show (vbox7);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox7, FALSE, FALSE, 0);
 
+       PACK_CHECK_BUTTON(vbox7, ssl_certs_auto_accept_checkbtn,
+                         _("Automatically accept valid SSL certificates"));
+
        PACK_CHECK_BUTTON(vbox7, use_nonblocking_ssl_checkbtn,
                          _("Use non-blocking SSL"));
 
@@ -2546,6 +2598,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
        page->entry_out_cert_file     = entry_out_cert_file;
        page->entry_out_cert_pass     = entry_out_cert_pass;
 
+       page->ssl_certs_auto_accept_checkbtn = ssl_certs_auto_accept_checkbtn;
        page->use_nonblocking_ssl_checkbtn = use_nonblocking_ssl_checkbtn;
 
        tmp_ac_prefs = *ac_prefs;
@@ -2588,10 +2641,11 @@ static void advanced_create_widget_func(PrefsPage * _page,
        GtkWidget *checkbtn_domain;
        GtkWidget *entry_domain;
        gchar *tip_domain;
-       GtkWidget *checkbtn_msgid_with_addr;
+#if !GTK_CHECK_VERSION(3, 0, 0)
        GtkWidget *checkbtn_crosspost;
        GtkWidget *colormenu_crosspost;
        GtkWidget *menu;
+#endif
 #ifndef G_OS_WIN32
        GtkWidget *checkbtn_tunnelcmd;
        GtkWidget *entry_tunnelcmd;
@@ -2608,9 +2662,8 @@ static void advanced_create_widget_func(PrefsPage * _page,
        GtkWidget *trash_folder_checkbtn;
        GtkWidget *trash_folder_entry;
        GtkWidget *imap_use_trash_checkbtn;
-
-       CLAWS_TIP_DECL();
        GtkSizeGroup *size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
 #define PACK_HBOX(hbox) \
        { \
        hbox = gtk_hbox_new (FALSE, 8); \
@@ -2674,9 +2727,6 @@ static void advanced_create_widget_func(PrefsPage * _page,
        gtk_box_pack_start (GTK_BOX (hbox1), entry_domain, TRUE, TRUE, 0);
        SET_TOGGLE_SENSITIVITY (checkbtn_domain, entry_domain);
        CLAWS_SET_TIP(entry_domain, tip_domain);
-       PACK_HBOX (hbox1);
-       PACK_CHECK_BUTTON (hbox1, checkbtn_msgid_with_addr,
-                          _("Send account mail address in Message-ID"));
 
 #ifndef G_OS_WIN32     
        PACK_HBOX (hbox1);
@@ -2693,6 +2743,7 @@ static void advanced_create_widget_func(PrefsPage * _page,
        CLAWS_SET_TIP(imap_use_trash_checkbtn,
                             _("Moves deleted mails to trash instead of using the \\Deleted flag without expunging."));
 
+#if !GTK_CHECK_VERSION(3, 0, 0)
        PACK_CHECK_BUTTON (hbox1, checkbtn_crosspost, 
                           _("Mark cross-posted messages as read and color:"));
        g_signal_connect (G_OBJECT (checkbtn_crosspost), "toggled",
@@ -2706,6 +2757,7 @@ static void advanced_create_widget_func(PrefsPage * _page,
        menu = colorlabel_create_color_menu();
        gtk_cmoption_menu_set_menu (GTK_CMOPTION_MENU(colormenu_crosspost), menu);
        SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
+#endif
 
        PACK_HBOX (hbox1);
 #undef PACK_HBOX
@@ -2771,9 +2823,10 @@ static void advanced_create_widget_func(PrefsPage * _page,
        page->nntpport_spinbtn          = spinbtn_nntpport;
        page->domain_checkbtn           = checkbtn_domain;
        page->domain_entry              = entry_domain;
-       page->msgid_with_addr_checkbtn  = checkbtn_msgid_with_addr;
+#if !GTK_CHECK_VERSION(3, 0, 0)
        page->crosspost_checkbtn        = checkbtn_crosspost;
        page->crosspost_colormenu       = colormenu_crosspost;
+#endif
 
 #ifndef G_OS_WIN32
        page->tunnelcmd_checkbtn        = checkbtn_tunnelcmd;
@@ -2799,6 +2852,8 @@ static void advanced_create_widget_func(PrefsPage * _page,
        page->vbox = vbox1;
 
        page->page.widget = vbox1;
+       
+       g_object_unref(G_OBJECT(size_group));
 }
        
 static gint prefs_basic_apply(void)
@@ -2882,14 +2937,14 @@ static gint prefs_basic_apply(void)
        
        if (protocol == A_IMAP4 || protocol == A_NNTP) 
                old_id = g_strdup_printf("#%s/%s",
-                               protocol == A_IMAP4 ? "imap":"nntp",
+                               protocol == A_IMAP4 ? "imap":"news",
                                tmp_ac_prefs.account_name ? tmp_ac_prefs.account_name : "(null)");
        
        prefs_set_data_from_dialog(basic_param);
        
        if (protocol == A_IMAP4 || protocol == A_NNTP) {
                new_id = g_strdup_printf("#%s/%s",
-                               protocol == A_IMAP4 ? "imap":"nntp",
+                               protocol == A_IMAP4 ? "imap":"news",
                                tmp_ac_prefs.account_name);
                if (old_id != NULL && new_id != NULL)
                        prefs_filtering_rename_path(old_id, new_id);
@@ -3344,8 +3399,13 @@ static gboolean sslcert_get_password(gpointer source, gpointer data)
 { 
        struct GetPassData pass_data;
        /* do complicated stuff to be able to call GTK from the mainloop */
+#if !GLIB_CHECK_VERSION(2,32,0)
        pass_data.cond = g_cond_new();
-       pass_data.mutex = g_mutex_new();
+#else
+       pass_data.cond = g_new0(GCond, 1);
+       g_cond_init(pass_data.cond);
+#endif
+       pass_data.mutex = cm_mutex_new();
        pass_data.pass = (gchar **)source;
 
        g_mutex_lock(pass_data.mutex);
@@ -3353,9 +3413,14 @@ static gboolean sslcert_get_password(gpointer source, gpointer data)
        g_idle_add(do_get_pass, &pass_data);
 
        g_cond_wait(pass_data.cond, pass_data.mutex);
+#if !GLIB_CHECK_VERSION(2,32,0)
        g_cond_free(pass_data.cond);
+#else
+       g_cond_clear(pass_data.cond);
+       g_free(pass_data.cond);
+#endif
        g_mutex_unlock(pass_data.mutex);
-       g_mutex_free(pass_data.mutex);
+       cm_mutex_free(pass_data.mutex);
 
        return TRUE;
 }
@@ -3423,6 +3488,7 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
        gchar *rcpath;
        gint id;
        gchar **strv, **cur;
+       gsize len;
 
        cm_return_if_fail(ac_prefs != NULL);
        cm_return_if_fail(label != NULL);
@@ -3456,7 +3522,7 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
        if (privacy_prefs != NULL) {
                strv = g_strsplit(privacy_prefs, ",", 0);
                for (cur = strv; *cur != NULL; cur++) {
-                       gchar *encvalue, *value;
+                       gchar *encvalue, *tmp;
 
                        encvalue = strchr(*cur, '=');
                        if (encvalue == NULL)
@@ -3464,16 +3530,19 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
                        encvalue[0] = '\0';
                        encvalue++;
 
-                       value = g_malloc0(strlen(encvalue));
-                       if (base64_decode(value, encvalue, strlen(encvalue)) > 0)
-                               g_hash_table_insert(ac_prefs->privacy_prefs, g_strdup(*cur), g_strdup(value));
-                       g_free(value);
+                       tmp = g_base64_decode_zero(encvalue, &len);
+                       if (len > 0)
+                               g_hash_table_insert(ac_prefs->privacy_prefs, g_strdup(*cur), tmp);
+                       else
+                               g_free(tmp);
                }
                g_strfreev(strv);
                g_free(privacy_prefs);
                privacy_prefs = NULL;
        }
 
+       ac_prefs->receive_in_progress = FALSE;
+
        prefs_custom_header_read_config(ac_prefs);
 }
 
@@ -3486,8 +3555,7 @@ static void create_privacy_prefs(gpointer key, gpointer _value, gpointer user_da
        if (str->len > 0)
                g_string_append_c(str, ',');
 
-       encvalue = g_malloc0(B64LEN(strlen(value)) + 1);
-       base64_encode(encvalue, (gchar *) value, strlen(value));
+       encvalue = g_base64_encode(value, strlen(value));
        g_string_append_printf(str, "%s=%s", (gchar *) key, encvalue);
        g_free(encvalue);
 }
@@ -3669,13 +3737,21 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs, gboolean *dirty)
 
        if (!cancelled && dirty != NULL)
                *dirty = TRUE;
-       if (cancelled && new_account) {
-               prefs_account_free(ac_prefs);
+       if (cancelled && new_account)
                return NULL;
-       } else 
+       else {
+               if (ac_prefs->recv_server)
+                       g_strstrip(ac_prefs->recv_server);
+               if (ac_prefs->smtp_server)
+                       g_strstrip(ac_prefs->smtp_server);
+               if (ac_prefs->nntp_server)
+                       g_strstrip(ac_prefs->nntp_server);
+
                return ac_prefs;
+       }
 }
 
+#if !GTK_CHECK_VERSION(3, 0, 0)
 static void crosspost_color_toggled(void)
 {
        gboolean is_active;
@@ -3708,6 +3784,7 @@ static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
        gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
 }
+#endif
 
 static void pop_bfr_smtp_tm_set_sens(GtkWidget *widget, gpointer data)
 {
@@ -3734,6 +3811,109 @@ static void prefs_account_select_folder_cb(GtkWidget *widget, gpointer data)
        }
 }
 
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+static void auto_configure_cb (GtkWidget *widget, gpointer data)
+{
+       gchar *address = NULL;
+       const gchar *domain = NULL;
+       AutoConfigureData *recv_data;
+       AutoConfigureData *send_data;
+       static GCancellable *recv_cancel = NULL;
+       static GCancellable *send_cancel = NULL;
+       RecvProtocol protocol;
+       struct BasicProtocol *protocol_optmenu = (struct BasicProtocol *) basic_page.protocol_optmenu;
+       GtkWidget *optmenu = protocol_optmenu->combobox;
+
+       if (!recv_cancel) {
+               recv_cancel = g_cancellable_new();
+               send_cancel = g_cancellable_new();
+       }
+
+       if (widget == basic_page.auto_configure_cancel_btn) {
+               g_cancellable_cancel(recv_cancel);
+               g_cancellable_cancel(send_cancel);
+               g_object_unref(recv_cancel);
+               g_object_unref(send_cancel);
+               recv_cancel = NULL;
+               send_cancel = NULL;
+               return;
+       }
+
+       protocol = combobox_get_active_data(GTK_COMBO_BOX(optmenu));
+
+       address = gtk_editable_get_chars(GTK_EDITABLE(basic_page.addr_entry), 0, -1);
+
+       if (strchr(address, '@') == NULL) {
+               g_free(address);
+               gtk_label_set_text(GTK_LABEL(basic_page.auto_configure_lbl),
+                          _("Failed (wrong address)"));
+               return;
+       }
+
+       if (protocol == A_POP3 || protocol == A_IMAP4) {
+               recv_data = g_new0(AutoConfigureData, 1);
+               recv_data->configure_button = GTK_BUTTON(basic_page.auto_configure_btn);
+               recv_data->cancel_button = GTK_BUTTON(basic_page.auto_configure_cancel_btn);
+               recv_data->info_label = GTK_LABEL(basic_page.auto_configure_lbl);
+               recv_data->cancel = recv_cancel;
+               switch(protocol) {
+               case A_POP3:
+                       recv_data->ssl_service = "pop3s";
+                       recv_data->tls_service = "pop3";
+                       recv_data->address = g_strdup(address);
+                       recv_data->hostname_entry = GTK_ENTRY(basic_page.recvserv_entry);
+                       recv_data->set_port = GTK_TOGGLE_BUTTON(advanced_page.popport_checkbtn);
+                       recv_data->port = GTK_SPIN_BUTTON(advanced_page.popport_spinbtn);
+                       recv_data->tls_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.pop_starttls_radiobtn);
+                       recv_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.pop_ssltunnel_radiobtn);
+                       recv_data->default_port = 110;
+                       recv_data->default_ssl_port = 995;
+                       recv_data->uid_entry = GTK_ENTRY(basic_page.uid_entry);
+                       break;
+               case A_IMAP4:
+                       recv_data->ssl_service = "imaps";
+                       recv_data->tls_service = "imap";
+                       recv_data->address = g_strdup(address);
+                       recv_data->hostname_entry = GTK_ENTRY(basic_page.recvserv_entry);
+                       recv_data->set_port = GTK_TOGGLE_BUTTON(advanced_page.imapport_checkbtn);
+                       recv_data->port = GTK_SPIN_BUTTON(advanced_page.imapport_spinbtn);
+                       recv_data->tls_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.imap_starttls_radiobtn);
+                       recv_data->ssl_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.imap_ssltunnel_radiobtn);
+                       recv_data->default_port = 143;
+                       recv_data->default_ssl_port = 993;
+                       recv_data->uid_entry = GTK_ENTRY(basic_page.uid_entry);
+                       break;
+               default:
+                       cm_return_if_fail(FALSE);
+               }
+               auto_configure_service(recv_data);
+       }
+
+       send_data = g_new0(AutoConfigureData, 1);
+       send_data->configure_button = GTK_BUTTON(basic_page.auto_configure_btn);
+       send_data->cancel_button = GTK_BUTTON(basic_page.auto_configure_cancel_btn);
+       send_data->info_label = GTK_LABEL(basic_page.auto_configure_lbl);
+       send_data->cancel = send_cancel;
+
+       send_data->ssl_service = NULL;
+       send_data->tls_service = "submission";
+       recv_data->address = g_strdup(address);
+       send_data->hostname_entry = GTK_ENTRY(basic_page.smtpserv_entry);
+       send_data->set_port = GTK_TOGGLE_BUTTON(advanced_page.smtpport_checkbtn);
+       send_data->port = GTK_SPIN_BUTTON(advanced_page.smtpport_spinbtn);
+       send_data->tls_checkbtn = GTK_TOGGLE_BUTTON(ssl_page.smtp_starttls_radiobtn);
+       send_data->ssl_checkbtn = NULL;
+       send_data->default_port = 25;
+       send_data->default_ssl_port = -1;
+       send_data->uid_entry = NULL;
+       send_data->auth_checkbtn = GTK_TOGGLE_BUTTON(send_page.smtp_auth_checkbtn);
+
+       auto_configure_service(send_data);
+
+       g_free(address);
+}
+#endif
+
 static void prefs_account_sigfile_radiobtn_cb(GtkWidget *widget, gpointer data)
 {
        gtk_widget_set_sensitive(GTK_WIDGET(signature_browse_button), TRUE);
@@ -3903,9 +4083,10 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
                                        GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn), 
                                        TRUE);
                        gtk_widget_hide(send_page.msgid_checkbtn);
-               } else {
+               } else
                        gtk_widget_show(send_page.msgid_checkbtn);
-               }
+
+               gtk_widget_show(send_page.xmailer_checkbtn);
        }
 }
 
@@ -4044,6 +4225,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
 
        gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
        gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
+
        switch(protocol) {
        case A_NNTP:
 #ifndef HAVE_LIBETPAN
@@ -4054,6 +4236,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
 #endif
                gtk_widget_show(send_page.msgid_checkbtn);
+               gtk_widget_show(send_page.xmailer_checkbtn);
                gtk_widget_show(basic_page.nntpserv_label);
                gtk_widget_show(basic_page.nntpserv_entry);
                gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),
@@ -4137,8 +4320,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(advanced_page.popport_hbox);
                gtk_widget_hide(advanced_page.imapport_hbox);
                gtk_widget_show(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
                gtk_widget_show(advanced_page.crosspost_checkbtn);
                gtk_widget_show(advanced_page.crosspost_colormenu);
+#endif
 #ifndef G_OS_WIN32
                gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
                gtk_widget_hide(advanced_page.tunnelcmd_entry);
@@ -4151,6 +4336,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                break;
        case A_LOCAL:
                gtk_widget_show(send_page.msgid_checkbtn);
+               gtk_widget_show(send_page.xmailer_checkbtn);
                gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
                gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
                gtk_widget_hide(basic_page.nntpserv_label);
@@ -4232,8 +4418,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(advanced_page.popport_hbox);
                gtk_widget_hide(advanced_page.imapport_hbox);
                gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
                gtk_widget_hide(advanced_page.crosspost_checkbtn);
                gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
 #ifndef G_OS_WIN32
                gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
                gtk_widget_hide(advanced_page.tunnelcmd_entry);
@@ -4254,6 +4442,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                GTK_TOGGLE_BUTTON(send_page.msgid_checkbtn), 
                                TRUE);
                gtk_widget_hide(send_page.msgid_checkbtn);
+               gtk_widget_show(send_page.xmailer_checkbtn);
                gtk_widget_hide(basic_page.nntpserv_label);
                gtk_widget_hide(basic_page.nntpserv_entry);
                gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),
@@ -4336,8 +4525,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(advanced_page.popport_hbox);
                gtk_widget_show(advanced_page.imapport_hbox);
                gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
                gtk_widget_hide(advanced_page.crosspost_checkbtn);
                gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
 #ifndef G_OS_WIN32
                gtk_widget_show(advanced_page.tunnelcmd_checkbtn);
                gtk_widget_show(advanced_page.tunnelcmd_entry);
@@ -4350,6 +4541,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                break;
        case A_NONE:
                gtk_widget_show(send_page.msgid_checkbtn);
+               gtk_widget_show(send_page.xmailer_checkbtn);
                gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
                gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
                gtk_widget_hide(basic_page.nntpserv_label);
@@ -4429,8 +4621,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(advanced_page.popport_hbox);
                gtk_widget_hide(advanced_page.imapport_hbox);
                gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
                gtk_widget_hide(advanced_page.crosspost_checkbtn);
                gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
 #ifndef G_OS_WIN32
                gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
                gtk_widget_hide(advanced_page.tunnelcmd_entry);
@@ -4442,8 +4636,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_hide(receive_page.low_bandwidth_checkbtn);
                break;
        case A_POP3:
+               /* continue to default: */
        default:
                gtk_widget_show(send_page.msgid_checkbtn);
+               gtk_widget_show(send_page.xmailer_checkbtn);
                gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
                gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
                gtk_widget_hide(basic_page.nntpserv_label);
@@ -4528,8 +4724,10 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_widget_show(advanced_page.popport_hbox);
                gtk_widget_hide(advanced_page.imapport_hbox);
                gtk_widget_hide(advanced_page.nntpport_hbox);
+#if !GTK_CHECK_VERSION(3, 0, 0)
                gtk_widget_hide(advanced_page.crosspost_checkbtn);
                gtk_widget_hide(advanced_page.crosspost_colormenu);
+#endif
 #ifndef G_OS_WIN32
                gtk_widget_hide(advanced_page.tunnelcmd_checkbtn);
                gtk_widget_hide(advanced_page.tunnelcmd_entry);
@@ -4550,7 +4748,7 @@ static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
 {
        gboolean auth;
 
-       if (!gtkut_widget_get_sensitive (GTK_WIDGET (button)))
+       if (!gtk_widget_get_sensitive (GTK_WIDGET (button)))
                return;
        auth = gtk_toggle_button_get_active (button);
        gtk_widget_set_sensitive(basic_page.uid_label,  auth);