mark crossposted messages as read
[claws.git] / src / prefs_account.c
index e356bab6e81d925f7551a5a7f939b83f49251c92..be9a41d2da3d64c1758cf556201cb9e4443576d6 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 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
@@ -46,6 +46,7 @@
 #include "gtkutils.h"
 #include "utils.h"
 #include "alertpanel.h"
+#include "colorlabel.h"
 
 static gboolean cancelled;
 
@@ -86,7 +87,8 @@ static struct Receive {
        GtkWidget *pop3_frame;
        GtkWidget *rmmail_chkbtn;
        GtkWidget *getall_chkbtn;
-       GtkWidget *recvatgetall_chkbtn;
+       GtkWidget *size_limit_chkbtn;
+       GtkWidget *size_limit_entry;
        GtkWidget *filter_on_recv_chkbtn;
        GtkWidget *inbox_label;
        GtkWidget *inbox_entry;
@@ -94,6 +96,8 @@ static struct Receive {
 
        GtkWidget *imap_frame;
        GtkWidget *imapdir_entry;
+
+       GtkWidget *recvatgetall_chkbtn;
 } receive;
 
 static struct Send {
@@ -103,14 +107,14 @@ static struct Send {
        GtkWidget *customhdr_chkbtn;
 
        GtkWidget *smtp_auth_chkbtn;
-       GtkWidget *smtp_userid_entry;
-       GtkWidget *smtp_passwd_entry;
+       GtkWidget *smtp_uid_entry;
+       GtkWidget *smtp_pass_entry;
        GtkWidget *pop_bfr_smtp_chkbtn;
 } send;
 
 static struct Compose {
        GtkWidget *sigpath_entry;
-        
+
        GtkWidget *autocc_chkbtn;
        GtkWidget *autocc_entry;
        GtkWidget *autobcc_chkbtn;
@@ -121,6 +125,9 @@ static struct Compose {
 
 #if USE_GPGME
 static struct Privacy {
+       GtkWidget *checkbtn_default_encrypt;
+       GtkWidget *checkbtn_ascii_armored;
+       GtkWidget *checkbtn_default_sign;
        GtkWidget *defaultkey_radiobtn;
        GtkWidget *emailkey_radiobtn;
        GtkWidget *customkey_radiobtn;
@@ -155,6 +162,11 @@ static struct Advanced {
        GtkWidget *nntpport_entry;
        GtkWidget *domain_chkbtn;
        GtkWidget *domain_entry;
+       GtkWidget *tunnelcmd_chkbtn;
+       GtkWidget *tunnelcmd_entry;
+       GtkWidget *crosspost_chkbtn;
+       GtkWidget *crosspost_colormenu;
+
 } advanced;
 
 static void prefs_account_fix_size                     (void);
@@ -165,12 +177,18 @@ static void prefs_account_protocol_activated              (GtkMenuItem *menuitem);
 #if USE_GPGME || USE_SSL
 static void prefs_account_enum_set_data_from_radiobtn  (PrefParam *pparam);
 static void prefs_account_enum_set_radiobtn            (PrefParam *pparam);
+static void prefs_account_ascii_armored_warning(GtkWidget* widget, 
+                                              gpointer unused);
 #endif /* USE_GPGME || USE_SSL */
+static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam);
+static void prefs_account_crosspost_set_colormenu(PrefParam *pparam);
 
 static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
                                           gpointer user_data);
 static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
                                          gpointer user_data);
+static void prefs_account_smtp_userid_cb(GtkEditable *editable,
+                                        gpointer smtp_passwd);
 
 static PrefParam param[] = {
        /* Basic */
@@ -210,7 +228,7 @@ static PrefParam param[] = {
        {"use_mail_command", "FALSE", &tmp_ac_prefs.use_mail_command, P_BOOL,
         &basic.mailcmd_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"mail_command", "/usr/sbin/sendmail", &tmp_ac_prefs.mail_command, P_STRING,
+       {"mail_command", "/usr/sbin/sendmail -t", &tmp_ac_prefs.mail_command, P_STRING,
         &basic.mailcmd_entry, prefs_set_data_from_entry, prefs_set_entry},
 
        {"use_nntp_auth", "FALSE", &tmp_ac_prefs.use_nntp_auth, P_BOOL,
@@ -235,9 +253,12 @@ static PrefParam param[] = {
         &receive.getall_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL,
-        &receive.recvatgetall_chkbtn,
+       {"enable_size_limit", "FALSE", &tmp_ac_prefs.enable_size_limit, P_BOOL,
+        &receive.size_limit_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"size_limit", "1024", &tmp_ac_prefs.size_limit, P_INT,
+        &receive.size_limit_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
 
        {"filter_on_receive", "TRUE", &tmp_ac_prefs.filter_on_recv, P_BOOL,
         &receive.filter_on_recv_chkbtn,
@@ -246,6 +267,10 @@ static PrefParam param[] = {
        {"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING,
         &receive.imapdir_entry, prefs_set_data_from_entry, prefs_set_entry},
 
+       {"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL,
+        &receive.recvatgetall_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        /* Send */
        {"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
         &send.date_chkbtn,
@@ -263,11 +288,10 @@ static PrefParam param[] = {
         &send.smtp_auth_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"smtp_user_id", "ENV_USER", &tmp_ac_prefs.smtp_userid, P_STRING,
-        &send.smtp_userid_entry, prefs_set_data_from_entry, prefs_set_entry},
-
+       {"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING,
+        &send.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
        {"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_STRING,
-        &send.smtp_passwd_entry, prefs_set_data_from_entry, prefs_set_entry},
+        &send.smtp_pass_entry, prefs_set_data_from_entry, prefs_set_entry},
 
        {"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL,
         &send.pop_bfr_smtp_chkbtn,
@@ -305,6 +329,15 @@ static PrefParam param[] = {
 
 #if USE_GPGME
        /* Privacy */
+       {"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL,
+        &privacy.checkbtn_default_encrypt,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"ascii_armored", "FALSE", &tmp_ac_prefs.ascii_armored, P_BOOL,
+        &privacy.checkbtn_ascii_armored,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
+        &privacy.checkbtn_default_sign,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
         &privacy.defaultkey_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,
@@ -367,6 +400,24 @@ static PrefParam param[] = {
         &advanced.domain_entry,
         prefs_set_data_from_entry, prefs_set_entry},
 
+       {"set_tunnelcmd", "FALSE", &tmp_ac_prefs.set_tunnelcmd, P_BOOL,
+        &advanced.tunnelcmd_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
+       {"tunnelcmd", NULL, &tmp_ac_prefs.tunnelcmd, P_STRING,
+        &advanced.tunnelcmd_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
+
+       {"mark_crosspost_read", "FALSE", &tmp_ac_prefs.mark_crosspost_read, P_BOOL,
+        &advanced.crosspost_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
+       {"crosspost_color", NULL, &tmp_ac_prefs.crosspost_col, P_ENUM,
+        &advanced.crosspost_colormenu,
+        prefs_account_crosspost_set_data_from_colormenu,
+        prefs_account_crosspost_set_colormenu},
+
+
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
@@ -432,8 +483,6 @@ void prefs_account_save_config_all(GList *account_list)
        gchar *rcpath;
        PrefFile *pfile;
 
-       if (!account_list) return;
-
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
        if ((pfile = prefs_write_open(rcpath)) == NULL) {
                g_free(rcpath);
@@ -502,6 +551,9 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
 
        if (!ac_prefs) {
                ac_prefs = g_new0(PrefsAccount, 1);
+               memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
+               prefs_set_default(param);
+               *ac_prefs = tmp_ac_prefs;
                ac_prefs->account_id = prefs_account_get_new_id();
                new_account = TRUE;
        }
@@ -533,6 +585,12 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
                        gtk_entry_set_text(GTK_ENTRY(basic.org_entry),
                                           def_ac->organization ? def_ac->organization : "");
                }
+               menu_set_sensitive_all
+                       (GTK_MENU_SHELL
+                               (gtk_option_menu_get_menu
+                                       (GTK_OPTION_MENU
+                                               (basic.protocol_optmenu))),
+                        TRUE);
                gtk_window_set_title(GTK_WINDOW(dialog.window),
                                     _("Preferences for new account"));
                gtk_widget_hide(dialog.apply_btn);
@@ -575,10 +633,8 @@ static void prefs_account_create(void)
                           GTK_SIGNAL_FUNC(prefs_account_deleted), NULL);
        gtk_signal_connect(GTK_OBJECT(dialog.window), "key_press_event",
                           GTK_SIGNAL_FUNC(prefs_account_key_pressed), NULL);
-       gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_in_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_out_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT(dialog.window);
+
        gtk_signal_connect(GTK_OBJECT(dialog.ok_btn), "clicked",
                           GTK_SIGNAL_FUNC(prefs_account_ok), NULL);
        gtk_signal_connect(GTK_OBJECT(dialog.apply_btn), "clicked",
@@ -926,17 +982,19 @@ static void prefs_account_receive_create(void)
        GtkWidget *vbox2;
        GtkWidget *rmmail_chkbtn;
        GtkWidget *getall_chkbtn;
-       GtkWidget *recvatgetall_chkbtn;
+       GtkWidget *hbox1;
+       GtkWidget *size_limit_chkbtn;
+       GtkWidget *size_limit_entry;
+       GtkWidget *label;
        GtkWidget *filter_on_recv_chkbtn;
        GtkWidget *vbox3;
-       GtkWidget *hbox1;
        GtkWidget *inbox_label;
        GtkWidget *inbox_entry;
        GtkWidget *inbox_btn;
-       GtkWidget *label;
        GtkWidget *frame2;
        GtkWidget *imapdir_label;
        GtkWidget *imapdir_entry;
+       GtkWidget *recvatgetall_chkbtn;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -954,9 +1012,24 @@ static void prefs_account_receive_create(void)
                           _("Remove messages on server when received"));
        PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
                           _("Download all messages on server"));
-       PACK_CHECK_BUTTON
-               (vbox2, recvatgetall_chkbtn,
-                _("`Get all' checks for new mail on this account"));
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+       PACK_CHECK_BUTTON (hbox1, size_limit_chkbtn, _("Receive size limit"));
+
+       size_limit_entry = gtk_entry_new ();
+       gtk_widget_show (size_limit_entry);
+       gtk_widget_set_usize (size_limit_entry, 64, -1);
+       gtk_box_pack_start (GTK_BOX (hbox1), size_limit_entry, FALSE, FALSE, 0);
+
+       label = gtk_label_new ("KB");
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+
+       SET_TOGGLE_SENSITIVITY (size_limit_chkbtn, size_limit_entry);
+
        PACK_CHECK_BUTTON (vbox2, filter_on_recv_chkbtn,
                           _("Filter messages on receiving"));
 
@@ -1013,10 +1086,15 @@ static void prefs_account_receive_create(void)
        gtk_widget_show (imapdir_entry);
        gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, TRUE, TRUE, 0);
 
+       PACK_CHECK_BUTTON
+               (vbox1, recvatgetall_chkbtn,
+                _("`Get all' checks for new messages on this account"));
+
        receive.pop3_frame            = frame1;
        receive.rmmail_chkbtn         = rmmail_chkbtn;
        receive.getall_chkbtn         = getall_chkbtn;
-       receive.recvatgetall_chkbtn   = recvatgetall_chkbtn;
+       receive.size_limit_chkbtn     = size_limit_chkbtn;
+       receive.size_limit_entry      = size_limit_entry;
        receive.filter_on_recv_chkbtn = filter_on_recv_chkbtn;
        receive.inbox_label           = inbox_label;
        receive.inbox_entry           = inbox_entry;
@@ -1024,6 +1102,8 @@ static void prefs_account_receive_create(void)
 
        receive.imap_frame    = frame2;
        receive.imapdir_entry = imapdir_entry;
+
+       receive.recvatgetall_chkbtn   = recvatgetall_chkbtn;
 }
 
 static void prefs_account_send_create(void)
@@ -1039,12 +1119,12 @@ static void prefs_account_send_create(void)
        GtkWidget *frame3;
        GtkWidget *vbox3;
        GtkWidget *smtp_auth_chkbtn;
-       GtkWidget *smtp_auth_hbox;
+       GtkWidget *vbox4;
+       GtkWidget *hbox_spc;
        GtkWidget *label;
-       GtkWidget *uid_label;
-       GtkWidget *smtp_userid_entry;
-       GtkWidget *pass_label;
-       GtkWidget *smtp_passwd_entry;
+       GtkWidget *smtp_uid_entry;
+       GtkWidget *smtp_pass_entry;
+       GtkWidget *vbox_spc;
        GtkWidget *pop_bfr_smtp_chkbtn;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -1089,42 +1169,57 @@ static void prefs_account_send_create(void)
        PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
                _("SMTP Authentication (SMTP AUTH)"));
 
-       smtp_auth_hbox = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (smtp_auth_hbox);
-       gtk_box_pack_start (GTK_BOX (vbox3), smtp_auth_hbox, FALSE, FALSE, 0);
+       vbox4 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox4);
+       gtk_box_pack_start (GTK_BOX (vbox3), vbox4, FALSE, FALSE, 0);
 
-       label = gtk_label_new ("");
+       hbox = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
+
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox_spc);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_usize (hbox_spc, 16, -1);
+
+       label = gtk_label_new (_("User ID"));
        gtk_widget_show (label);
-       gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), label, FALSE, FALSE, 0);
-       gtk_widget_set_usize (label, 16, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
-       uid_label = gtk_label_new (_("User ID"));
-       gtk_widget_show (uid_label);
-       gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), uid_label,
-                           FALSE, FALSE, 0);
-       gtk_misc_set_alignment (GTK_MISC (uid_label), 1, 0.5);
-       SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, uid_label);
+       smtp_uid_entry = gtk_entry_new ();
+       gtk_widget_show (smtp_uid_entry);
+       gtk_widget_set_usize (smtp_uid_entry, DEFAULT_ENTRY_WIDTH, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), smtp_uid_entry, TRUE, TRUE, 0);
 
-       smtp_userid_entry = gtk_entry_new ();
-       gtk_widget_show (smtp_userid_entry);
-       gtk_widget_set_usize (smtp_userid_entry, DEFAULT_ENTRY_WIDTH, -1);
-       gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), smtp_userid_entry,
-                           TRUE, TRUE, 0);
-       SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, smtp_userid_entry);
+       label = gtk_label_new (_("Password"));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
-       pass_label = gtk_label_new (_("Password"));
-       gtk_widget_show (pass_label);
-       gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), pass_label,
-                           FALSE, FALSE, 0);
-       SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, pass_label);
+       smtp_pass_entry = gtk_entry_new ();
+       gtk_widget_show (smtp_pass_entry);
+       gtk_widget_set_usize (smtp_pass_entry, DEFAULT_ENTRY_WIDTH, -1);
+       gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0);
+       gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE);
 
-       smtp_passwd_entry = gtk_entry_new ();
-       gtk_widget_show (smtp_passwd_entry);
-       gtk_widget_set_usize (smtp_passwd_entry, DEFAULT_ENTRY_WIDTH, -1);
-       gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), smtp_passwd_entry,
-                           TRUE, TRUE, 0);
-       gtk_entry_set_visibility (GTK_ENTRY (smtp_passwd_entry), FALSE);
-       SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, smtp_passwd_entry);
+       PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
+
+       hbox = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
+
+       hbox_spc = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox_spc);
+       gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+       gtk_widget_set_usize (hbox_spc, 16, -1);
+
+       label = gtk_label_new
+               (_("If you leave these entries empty, the same\n"
+                  "user ID and password as receiving will be used."));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
+       SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, vbox4);
 
        PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
                _("Authenticate with POP3 before sending"));
@@ -1135,8 +1230,8 @@ static void prefs_account_send_create(void)
        send.customhdr_chkbtn = customhdr_chkbtn;
 
        send.smtp_auth_chkbtn    = smtp_auth_chkbtn;
-       send.smtp_userid_entry   = smtp_userid_entry;
-       send.smtp_passwd_entry   = smtp_passwd_entry;
+       send.smtp_uid_entry      = smtp_uid_entry;
+       send.smtp_pass_entry     = smtp_pass_entry;
        send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
 }
 
@@ -1236,8 +1331,13 @@ static void prefs_account_privacy_create(void)
        GtkWidget *vbox1;
        GtkWidget *frame1;
        GtkWidget *vbox2;
+       GtkWidget *frame2;
+       GtkWidget *vbox3;
        GtkWidget *hbox1;
        GtkWidget *label;
+       GtkWidget *checkbtn_default_encrypt;
+       GtkWidget *checkbtn_ascii_armored;
+       GtkWidget *checkbtn_default_sign;
        GtkWidget *defaultkey_radiobtn;
        GtkWidget *emailkey_radiobtn;
        GtkWidget *customkey_radiobtn;
@@ -1248,17 +1348,35 @@ static void prefs_account_privacy_create(void)
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-       PACK_FRAME (vbox1, frame1, _("Sign key"));
+       PACK_FRAME (vbox1, frame1, _("Default Actions"));
 
-       vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
        gtk_container_add (GTK_CONTAINER (frame1), vbox2);
        gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
+       PACK_CHECK_BUTTON (vbox2, checkbtn_default_encrypt,
+                          _("Encrypt message by default"));
+
+       PACK_CHECK_BUTTON (vbox2, checkbtn_ascii_armored,
+                          _("Plain ASCII armored"));
+       gtk_signal_connect(GTK_OBJECT(checkbtn_ascii_armored), "toggled",
+                               prefs_account_ascii_armored_warning, (gpointer)0);
+
+       PACK_CHECK_BUTTON (vbox2, checkbtn_default_sign,
+                          _("Sign message by default"));
+
+       PACK_FRAME (vbox1, frame2, _("Sign key"));
+
+       vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox3);
+       gtk_container_add (GTK_CONTAINER (frame2), vbox3);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+
        defaultkey_radiobtn = gtk_radio_button_new_with_label
                (NULL, _("Use default GnuPG key"));
        gtk_widget_show (defaultkey_radiobtn);
-       gtk_box_pack_start (GTK_BOX (vbox2), defaultkey_radiobtn,
+       gtk_box_pack_start (GTK_BOX (vbox3), defaultkey_radiobtn,
                            FALSE, FALSE, 0);
        gtk_object_set_user_data (GTK_OBJECT (defaultkey_radiobtn),
                                  GINT_TO_POINTER (SIGN_KEY_DEFAULT));
@@ -1267,7 +1385,7 @@ static void prefs_account_privacy_create(void)
                (GTK_RADIO_BUTTON (defaultkey_radiobtn),
                 _("Select key by your email address"));
        gtk_widget_show (emailkey_radiobtn);
-       gtk_box_pack_start (GTK_BOX (vbox2), emailkey_radiobtn,
+       gtk_box_pack_start (GTK_BOX (vbox3), emailkey_radiobtn,
                            FALSE, FALSE, 0);
        gtk_object_set_user_data (GTK_OBJECT (emailkey_radiobtn),
                                  GINT_TO_POINTER (SIGN_KEY_BY_FROM));
@@ -1276,14 +1394,14 @@ static void prefs_account_privacy_create(void)
                (GTK_RADIO_BUTTON (defaultkey_radiobtn),
                 _("Specify key manually"));
        gtk_widget_show (customkey_radiobtn);
-       gtk_box_pack_start (GTK_BOX (vbox2), customkey_radiobtn,
+       gtk_box_pack_start (GTK_BOX (vbox3), customkey_radiobtn,
                            FALSE, FALSE, 0);
        gtk_object_set_user_data (GTK_OBJECT (customkey_radiobtn),
                                  GINT_TO_POINTER (SIGN_KEY_CUSTOM));
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
 
        label = gtk_label_new ("");
        gtk_widget_show (label);
@@ -1301,11 +1419,26 @@ static void prefs_account_privacy_create(void)
 
        SET_TOGGLE_SENSITIVITY (customkey_radiobtn, customkey_entry);
 
+       privacy.checkbtn_default_encrypt = checkbtn_default_encrypt;
+       privacy.checkbtn_ascii_armored   = checkbtn_ascii_armored;
+       privacy.checkbtn_default_sign    = checkbtn_default_sign;
        privacy.defaultkey_radiobtn = defaultkey_radiobtn;
        privacy.emailkey_radiobtn = emailkey_radiobtn;
        privacy.customkey_radiobtn = customkey_radiobtn;
        privacy.customkey_entry = customkey_entry;
 }
+
+static void prefs_account_ascii_armored_warning(GtkWidget* widget,
+                                              gpointer unused)
+{
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))
+               && gtk_notebook_get_current_page(GTK_NOTEBOOK(dialog.notebook))) {
+               alertpanel_message(_("Warning - Privacy/Plain ASCII armored"),
+                       _("Its not recommend to use the old style plain ASCII\n"
+                       "armored mode for encypted messages. It doesn't comply\n"
+                       "with the RFC 3156 - MIME security with OpenPGP."));
+       }
+}
 #endif /* USE_GPGME */
 
 #if USE_SSL
@@ -1385,6 +1518,40 @@ static void prefs_account_ssl_create(void)
 }
 #endif /* USE_SSL */
 
+static void crosspost_color_toggled(void)
+{
+       gboolean is_active;
+
+       is_active = gtk_toggle_button_get_active
+               (GTK_TOGGLE_BUTTON(advanced.crosspost_chkbtn));
+       gtk_widget_set_sensitive(advanced.crosspost_colormenu, is_active);
+}
+
+static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam)
+{
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(advanced.crosspost_colormenu));
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       *((gint *)pparam->data) = GPOINTER_TO_INT
+               (gtk_object_get_data(GTK_OBJECT(menuitem), "color"));
+}
+
+static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
+{
+       gint colorlabel = *((gint *)pparam->data);
+       GtkOptionMenu *colormenu = GTK_OPTION_MENU(*pparam->widget);
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       gtk_option_menu_set_history(colormenu, colorlabel);
+       menu = gtk_option_menu_get_menu(colormenu);
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+}
+
+
 static void prefs_account_advanced_create(void)
 {
        GtkWidget *vbox1;
@@ -1403,21 +1570,29 @@ static void prefs_account_advanced_create(void)
        GtkWidget *entry_nntpport;
        GtkWidget *checkbtn_domain;
        GtkWidget *entry_domain;
+       GtkWidget *checkbtn_tunnelcmd;
+       GtkWidget *entry_tunnelcmd;
+       GtkWidget *checkbtn_crosspost;
+       GtkWidget *colormenu_crosspost;
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+       GtkWidget *item;
+       gint i;
 
 #define PACK_HBOX(hbox) \
-{ \
+       { \
        hbox = gtk_hbox_new (FALSE, 8); \
        gtk_widget_show (hbox); \
        gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); \
-}
+       }
 
 #define PACK_PORT_ENTRY(box, entry) \
-{ \
+       { \
        entry = gtk_entry_new_with_max_length (5); \
        gtk_widget_show (entry); \
        gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 0); \
        gtk_widget_set_usize (entry, 64, -1); \
-}
+       }
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -1459,6 +1634,30 @@ static void prefs_account_advanced_create(void)
        gtk_box_pack_start (GTK_BOX (hbox1), entry_domain, TRUE, TRUE, 0);
        SET_TOGGLE_SENSITIVITY (checkbtn_domain, entry_domain);
 
+       
+       PACK_HBOX (hbox1);
+       PACK_CHECK_BUTTON (hbox1, checkbtn_tunnelcmd,
+                          _("Tunnel command to open connection"));
+       entry_tunnelcmd = gtk_entry_new ();
+       gtk_widget_show (entry_tunnelcmd);
+       gtk_box_pack_start (GTK_BOX (hbox1), entry_tunnelcmd, TRUE, TRUE, 0);
+       SET_TOGGLE_SENSITIVITY (checkbtn_tunnelcmd, entry_tunnelcmd);
+
+       PACK_HBOX (hbox1);
+       PACK_CHECK_BUTTON (hbox1, checkbtn_crosspost, 
+                          _("Mark crossposted messages as read and color:"));
+       gtk_signal_connect (GTK_OBJECT (checkbtn_crosspost), "toggled",
+                                       GTK_SIGNAL_FUNC (crosspost_color_toggled),
+                                       NULL);
+
+       colormenu_crosspost = gtk_option_menu_new();
+       gtk_widget_show (colormenu_crosspost);
+       gtk_box_pack_start (GTK_BOX (hbox1), colormenu_crosspost, FALSE, FALSE, 0);
+
+       menu = colorlabel_create_color_menu();
+       gtk_option_menu_set_menu (GTK_OPTION_MENU(colormenu_crosspost), menu);
+       SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
+
 #undef PACK_HBOX
 #undef PACK_PORT_ENTRY
 
@@ -1475,6 +1674,10 @@ static void prefs_account_advanced_create(void)
        advanced.nntpport_entry         = entry_nntpport;
        advanced.domain_chkbtn          = checkbtn_domain;
        advanced.domain_entry           = entry_domain;
+       advanced.tunnelcmd_chkbtn       = checkbtn_tunnelcmd;
+       advanced.tunnelcmd_entry        = entry_tunnelcmd;
+       advanced.crosspost_chkbtn       = checkbtn_crosspost;
+       advanced.crosspost_colormenu    = colormenu_crosspost;
 }
 
 static gint prefs_account_deleted(GtkWidget *widget, GdkEventAny *event,
@@ -1563,10 +1766,14 @@ static void prefs_account_cancel(void)
 static void prefs_account_select_inbox_cb(void)
 {
        FolderItem *item;
-
-       item = foldersel_folder_sel(NULL, NULL);
-       if (item)
-               gtk_entry_set_text(GTK_ENTRY(receive.inbox_entry), item->path);
+       gchar      *path;
+
+       item = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL);
+       if (item) {
+               path = folder_item_get_identifier(item);
+               gtk_entry_set_text(GTK_ENTRY(receive.inbox_entry), path);
+               g_free(path);
+       }       
 }
 
 static void prefs_account_edit_custom_header(void)
@@ -1632,35 +1839,41 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
        GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
        GtkWidget *menu;
        GtkWidget *menuitem;
+       GList *children;
+       gint list_order[] = {
+               0,  /* A_POP3  */
+               1,  /* A_APOP  */
+               -1, /* A_RPOP  */
+               2,  /* A_IMAP4 */
+               3,  /* A_NNTP  */
+               4   /* A_LOCAL */
+       };
 
        protocol = *((RecvProtocol *)pparam->data);
+       if (protocol < 0 || protocol > A_LOCAL) return;
+       if (list_order[protocol] < 0) return;
+       gtk_option_menu_set_history(optmenu, list_order[protocol]);
 
-       switch (protocol) {
-       case A_POP3:
-               gtk_option_menu_set_history(optmenu, 0);
-               break;
-       case A_APOP:
-               gtk_option_menu_set_history(optmenu, 1);
-               break;
-       case A_IMAP4:
-               gtk_option_menu_set_history(optmenu, 2);
-               break;
-       case A_NNTP:
-               gtk_option_menu_set_history(optmenu, 3);
-               break;
-       case A_LOCAL:
-               gtk_option_menu_set_history(optmenu, 4);
-               break;
-               /*
-       case A_LOCAL_CMD:
-               gtk_option_menu_set_history(optmenu, 5);
-               break;
-               */
-       default:
-               break;
+       menu = gtk_option_menu_get_menu(optmenu);
+       menu_set_insensitive_all(GTK_MENU_SHELL(menu));
+
+#define SET_NTH_SENSITIVE(proto) \
+{ \
+       menuitem = g_list_nth_data(children, list_order[proto]); \
+       if (menuitem) \
+               gtk_widget_set_sensitive(menuitem, TRUE); \
+}
+
+       children = GTK_MENU_SHELL(menu)->children;
+       SET_NTH_SENSITIVE(protocol);
+       if (protocol == A_POP3) {
+               SET_NTH_SENSITIVE(A_APOP);
+       } else if (protocol == A_APOP) {
+               SET_NTH_SENSITIVE(A_POP3);
        }
 
-       menu = gtk_option_menu_get_menu(optmenu);
+#undef SET_NTH_SENSITIVE
+
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
        gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
 }
@@ -1720,6 +1933,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                        (GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL);
                gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
                gtk_widget_set_sensitive(receive.imap_frame, FALSE);
+               gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
 #if USE_SSL
                gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
                gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
@@ -1729,6 +1943,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
                gtk_widget_show(advanced.nntpport_hbox);
+               gtk_widget_show(advanced.crosspost_chkbtn);
+               gtk_widget_show(advanced.crosspost_colormenu);
                break;
        case A_LOCAL:
                gtk_widget_hide(basic.nntpserv_label);
@@ -1771,6 +1987,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.pass_entry, TRUE);
                gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
                gtk_widget_set_sensitive(receive.imap_frame, FALSE);
+               gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, FALSE);
                prefs_account_mailcmd_toggled
                        (GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
 
@@ -1783,6 +2000,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
                gtk_widget_hide(advanced.nntpport_hbox);
+               gtk_widget_hide(advanced.crosspost_chkbtn);
+               gtk_widget_hide(advanced.crosspost_colormenu);
                break;
        case A_IMAP4:
                gtk_widget_hide(basic.nntpserv_label);
@@ -1827,6 +2046,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.pass_entry, TRUE);
                gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
                gtk_widget_set_sensitive(receive.imap_frame, TRUE);
+               gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
 
@@ -1839,6 +2059,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_show(advanced.imapport_hbox);
                gtk_widget_hide(advanced.nntpport_hbox);
+               gtk_widget_hide(advanced.crosspost_chkbtn);
+               gtk_widget_hide(advanced.crosspost_colormenu);
                break;
        case A_POP3:
        default:
@@ -1884,6 +2106,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.pass_entry, TRUE);
                gtk_widget_set_sensitive(receive.pop3_frame, TRUE);
                gtk_widget_set_sensitive(receive.imap_frame, FALSE);
+               gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
 
@@ -1896,6 +2119,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_show(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
                gtk_widget_hide(advanced.nntpport_hbox);
+               gtk_widget_hide(advanced.crosspost_chkbtn);
+               gtk_widget_hide(advanced.crosspost_colormenu);
                break;
        }
 
@@ -1930,3 +2155,19 @@ static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
        gtk_widget_set_sensitive(basic.uid_entry,  !use_mailcmd);
        gtk_widget_set_sensitive(basic.pass_entry, !use_mailcmd);
 }
+
+static void prefs_account_smtp_userid_cb(GtkEditable *editable,
+                                        gpointer smtp_passwd)
+{
+       gchar *buf;
+       gboolean use_smtp_userid;
+       
+       buf = gtk_editable_get_chars(editable, 0, -1);
+       if(buf[0] == '\0') {
+               use_smtp_userid = FALSE;
+       } else {
+               use_smtp_userid = TRUE;
+       }
+       gtk_widget_set_sensitive(GTK_WIDGET(smtp_passwd), use_smtp_userid);
+       g_free(buf);
+}