correct a typo
[claws.git] / src / prefs_account.c
index be9a41d2da3d64c1758cf556201cb9e4443576d6..502c1eacc4ac9d7f9960c998b63141d62c45d5a1 100644 (file)
@@ -86,6 +86,7 @@ static struct Basic {
 static struct Receive {
        GtkWidget *pop3_frame;
        GtkWidget *rmmail_chkbtn;
+       GtkWidget *leave_time_entry;
        GtkWidget *getall_chkbtn;
        GtkWidget *size_limit_chkbtn;
        GtkWidget *size_limit_entry;
@@ -94,9 +95,6 @@ static struct Receive {
        GtkWidget *inbox_entry;
        GtkWidget *inbox_btn;
 
-       GtkWidget *imap_frame;
-       GtkWidget *imapdir_entry;
-
        GtkWidget *recvatgetall_chkbtn;
 } receive;
 
@@ -140,6 +138,7 @@ static struct SSLPrefs {
        GtkWidget *receive_frame;
        GtkWidget *pop_chkbtn;
        GtkWidget *imap_chkbtn;
+       GtkWidget *nntp_chkbtn;
 
        GtkWidget *send_frame;
        GtkWidget *smtp_nossl_radiobtn;
@@ -167,6 +166,15 @@ static struct Advanced {
        GtkWidget *crosspost_chkbtn;
        GtkWidget *crosspost_colormenu;
 
+       GtkWidget *imap_frame;
+       GtkWidget *imapdir_entry;
+
+       GtkWidget *sent_folder_chkbtn;
+       GtkWidget *sent_folder_entry;
+       GtkWidget *draft_folder_chkbtn;
+       GtkWidget *draft_folder_entry;
+       GtkWidget *trash_folder_chkbtn;
+       GtkWidget *trash_folder_entry;
 } advanced;
 
 static void prefs_account_fix_size                     (void);
@@ -248,6 +256,10 @@ static PrefParam param[] = {
        {"remove_mail", "TRUE", &tmp_ac_prefs.rmmail, P_BOOL,
         &receive.rmmail_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       
+       {"leave_mail_time", "0", &tmp_ac_prefs.leave_time, P_STRING,
+        &receive.leave_time_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
 
        {"get_all_mail", "FALSE", &tmp_ac_prefs.getall, P_BOOL,
         &receive.getall_chkbtn,
@@ -264,9 +276,6 @@ static PrefParam param[] = {
         &receive.filter_on_recv_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
-       {"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},
@@ -357,6 +366,8 @@ static PrefParam param[] = {
         &ssl.pop_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
        {"ssl_imap", "FALSE", &tmp_ac_prefs.ssl_imap, P_BOOL,
         &ssl.imap_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
+       {"ssl_nntp", "FALSE", &tmp_ac_prefs.ssl_nntp, P_BOOL,
+        &ssl.nntp_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
 #endif /* USE_SSL */
 
        /* Advanced */
@@ -417,6 +428,29 @@ static PrefParam param[] = {
         prefs_account_crosspost_set_data_from_colormenu,
         prefs_account_crosspost_set_colormenu},
 
+       {"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING,
+        &advanced.imapdir_entry, prefs_set_data_from_entry, prefs_set_entry},
+
+       {"set_sent_folder", "FALSE", &tmp_ac_prefs.set_sent_folder, P_BOOL,
+        &advanced.sent_folder_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"sent_folder", NULL, &tmp_ac_prefs.sent_folder, P_STRING,
+        &advanced.sent_folder_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
+
+       {"set_draft_folder", "FALSE", &tmp_ac_prefs.set_draft_folder, P_BOOL,
+        &advanced.draft_folder_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"draft_folder", NULL, &tmp_ac_prefs.draft_folder, P_STRING,
+        &advanced.draft_folder_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
+
+       {"set_trash_folder", "FALSE", &tmp_ac_prefs.set_trash_folder, P_BOOL,
+        &advanced.trash_folder_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+       {"trash_folder", NULL, &tmp_ac_prefs.trash_folder, P_STRING,
+        &advanced.trash_folder_entry,
+        prefs_set_data_from_entry, prefs_set_entry},
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
@@ -434,7 +468,8 @@ static void prefs_account_ssl_create                (void);
 #endif /* USE_SSL */
 static void prefs_account_advanced_create      (void);
 
-static void prefs_account_select_inbox_cb      (void);
+static void prefs_account_select_folder_cb     (GtkWidget      *widget,
+                                                gpointer        data);
 static void prefs_account_edit_custom_header   (void);
 
 static gint prefs_account_deleted              (GtkWidget      *widget,
@@ -988,12 +1023,13 @@ static void prefs_account_receive_create(void)
        GtkWidget *label;
        GtkWidget *filter_on_recv_chkbtn;
        GtkWidget *vbox3;
+       GtkWidget *hbox2;
        GtkWidget *inbox_label;
        GtkWidget *inbox_entry;
+       GtkWidget *leave_time_entry;
+       GtkWidget *leave_time_label;
+       GtkWidget *leave_time_hint;     
        GtkWidget *inbox_btn;
-       GtkWidget *frame2;
-       GtkWidget *imapdir_label;
-       GtkWidget *imapdir_entry;
        GtkWidget *recvatgetall_chkbtn;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -1008,8 +1044,26 @@ static void prefs_account_receive_create(void)
        gtk_container_add (GTK_CONTAINER (frame1), vbox2);
        gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
-       PACK_CHECK_BUTTON (vbox2, rmmail_chkbtn,
-                          _("Remove messages on server when received"));
+       hbox2 = gtk_hbox_new (FALSE, 0);
+       gtk_widget_show (hbox2);
+       gtk_container_add (GTK_CONTAINER (vbox2), hbox2);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox2), 0);
+
+       PACK_CHECK_BUTTON (hbox2, rmmail_chkbtn,
+                          _("Remove messages on server when received for "));
+       leave_time_entry = gtk_entry_new ();
+       gtk_widget_show (leave_time_entry);
+       gtk_widget_set_usize (leave_time_entry, DEFAULT_ENTRY_WIDTH, -1);
+       gtk_box_pack_start (GTK_BOX (hbox2), leave_time_entry, TRUE, TRUE, 0);
+       
+       leave_time_label = gtk_label_new (_(" days"));
+       gtk_widget_show (leave_time_label);
+       gtk_box_pack_start (GTK_BOX (hbox2), leave_time_label, FALSE, FALSE, 0);
+       
+       leave_time_hint=gtk_label_new (_("(Setting to 0 days will delete messages immediately)"));
+       gtk_widget_show(leave_time_hint);
+       gtk_box_pack_start (GTK_BOX (vbox2), leave_time_hint, FALSE, FALSE, 0);
+               
        PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
                           _("Download all messages on server"));
 
@@ -1052,8 +1106,8 @@ static void prefs_account_receive_create(void)
        gtk_widget_show (inbox_btn);
        gtk_box_pack_start (GTK_BOX (hbox1), inbox_btn, FALSE, FALSE, 0);
        gtk_signal_connect (GTK_OBJECT (inbox_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_account_select_inbox_cb),
-                           NULL);
+                           GTK_SIGNAL_FUNC (prefs_account_select_folder_cb),
+                           inbox_entry);
 
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
 
@@ -1067,31 +1121,13 @@ static void prefs_account_receive_create(void)
        gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-       PACK_FRAME (vbox1, frame2, _("IMAP4"));
-
-       vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
-       gtk_widget_show (vbox2);
-       gtk_container_add (GTK_CONTAINER (frame2), vbox2);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-       imapdir_label = gtk_label_new (_("IMAP server directory"));
-       gtk_widget_show (imapdir_label);
-       gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
-
-       imapdir_entry = gtk_entry_new();
-       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.leave_time_entry      = leave_time_entry;
        receive.getall_chkbtn         = getall_chkbtn;
        receive.size_limit_chkbtn     = size_limit_chkbtn;
        receive.size_limit_entry      = size_limit_entry;
@@ -1100,9 +1136,6 @@ static void prefs_account_receive_create(void)
        receive.inbox_entry           = inbox_entry;
        receive.inbox_btn             = inbox_btn;
 
-       receive.imap_frame    = frame2;
-       receive.imapdir_entry = imapdir_entry;
-
        receive.recvatgetall_chkbtn   = recvatgetall_chkbtn;
 }
 
@@ -1116,7 +1149,6 @@ static void prefs_account_send_create(void)
        GtkWidget *hbox;
        GtkWidget *customhdr_chkbtn;
        GtkWidget *customhdr_edit_btn;
-       GtkWidget *frame3;
        GtkWidget *vbox3;
        GtkWidget *smtp_auth_chkbtn;
        GtkWidget *vbox4;
@@ -1159,11 +1191,11 @@ static void prefs_account_send_create(void)
 
        SET_TOGGLE_SENSITIVITY (customhdr_chkbtn, customhdr_edit_btn);
 
-       PACK_FRAME (vbox1, frame3, _("Authentication"));
+       PACK_FRAME (vbox1, frame, _("Authentication"));
 
        vbox3 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox3);
-       gtk_container_add (GTK_CONTAINER (frame3), vbox3);
+       gtk_container_add (GTK_CONTAINER (frame), vbox3);
        gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
 
        PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
@@ -1359,7 +1391,7 @@ static void prefs_account_privacy_create(void)
                           _("Encrypt message by default"));
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_ascii_armored,
-                          _("Plain ASCII armored"));
+                          _("Plain ASCII-armored"));
        gtk_signal_connect(GTK_OBJECT(checkbtn_ascii_armored), "toggled",
                                prefs_account_ascii_armored_warning, (gpointer)0);
 
@@ -1433,9 +1465,9 @@ static void prefs_account_ascii_armored_warning(GtkWidget* widget,
 {
        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"
+               alertpanel_message(_("Warning - Privacy/Plain ASCII-armored"),
+                       _("Its not recommend to use the old style plain ASCII-\n"
+                       "armored mode for encrypted messages. It doesn't comply\n"
                        "with the RFC 3156 - MIME security with OpenPGP."));
        }
 }
@@ -1450,6 +1482,7 @@ static void prefs_account_ssl_create(void)
        GtkWidget *vbox2;
        GtkWidget *pop_chkbtn;
        GtkWidget *imap_chkbtn;
+       GtkWidget *nntp_chkbtn;
 
        GtkWidget *send_frame;
        GtkWidget *vbox3;
@@ -1473,6 +1506,8 @@ static void prefs_account_ssl_create(void)
                           _("Use SSL for POP3 connection"));
        PACK_CHECK_BUTTON (vbox2, imap_chkbtn,
                           _("Use SSL for IMAP4 connection"));
+       PACK_CHECK_BUTTON (vbox2, nntp_chkbtn,
+                          _("Use SSL for NNTP connection"));
 
        PACK_FRAME (vbox1, send_frame, _("Send (SMTP)"));
 
@@ -1510,6 +1545,7 @@ static void prefs_account_ssl_create(void)
        ssl.receive_frame = receive_frame;
        ssl.pop_chkbtn    = pop_chkbtn;
        ssl.imap_chkbtn   = imap_chkbtn;
+       ssl.nntp_chkbtn   = nntp_chkbtn;
 
        ssl.send_frame                = send_frame;
        ssl.smtp_nossl_radiobtn       = smtp_nossl_radiobtn;
@@ -1578,6 +1614,18 @@ static void prefs_account_advanced_create(void)
        GtkWidget *menuitem;
        GtkWidget *item;
        gint i;
+       GtkWidget *imap_frame;
+       GtkWidget *imapdir_label;
+       GtkWidget *imapdir_entry;
+       GtkWidget *folder_frame;
+       GtkWidget *vbox3;
+       GtkWidget *table;
+       GtkWidget *sent_folder_chkbtn;
+       GtkWidget *sent_folder_entry;
+       GtkWidget *draft_folder_chkbtn;
+       GtkWidget *draft_folder_entry;
+       GtkWidget *trash_folder_chkbtn;
+       GtkWidget *trash_folder_entry;
 
 #define PACK_HBOX(hbox) \
        { \
@@ -1645,7 +1693,7 @@ static void prefs_account_advanced_create(void)
 
        PACK_HBOX (hbox1);
        PACK_CHECK_BUTTON (hbox1, checkbtn_crosspost, 
-                          _("Mark crossposted messages as read and color:"));
+                          _("Mark cross-posted messages as read and color:"));
        gtk_signal_connect (GTK_OBJECT (checkbtn_crosspost), "toggled",
                                        GTK_SIGNAL_FUNC (crosspost_color_toggled),
                                        NULL);
@@ -1658,9 +1706,78 @@ static void prefs_account_advanced_create(void)
        gtk_option_menu_set_menu (GTK_OPTION_MENU(colormenu_crosspost), menu);
        SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
 
+       PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
+
+       vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_widget_show (vbox3);
+       gtk_container_add (GTK_CONTAINER (imap_frame), vbox3);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
+
+       imapdir_label = gtk_label_new (_("IMAP server directory"));
+       gtk_widget_show (imapdir_label);
+       gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
+
+       imapdir_entry = gtk_entry_new();
+       gtk_widget_show (imapdir_entry);
+       gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, TRUE, TRUE, 0);
+
 #undef PACK_HBOX
 #undef PACK_PORT_ENTRY
 
+       /* special folder setting (maybe these options are redundant) */
+
+       PACK_FRAME (vbox1, folder_frame, _("Folder"));
+
+       vbox3 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox3);
+       gtk_container_add (GTK_CONTAINER (folder_frame), vbox3);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+
+       table = gtk_table_new (3, 3, FALSE);
+       gtk_widget_show (table);
+       gtk_container_add (GTK_CONTAINER (vbox3), table);
+       gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
+       gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+
+#define SET_CHECK_BTN_AND_ENTRY(label, chkbtn, entry, n)               \
+{                                                                      \
+       GtkWidget *button;                                              \
+                                                                       \
+       chkbtn = gtk_check_button_new_with_label (label);               \
+       gtk_widget_show (chkbtn);                                       \
+       gtk_table_attach (GTK_TABLE (table), chkbtn,                    \
+                         0, 1, n, n + 1, GTK_FILL, 0, 0, 0);           \
+                                                                       \
+       entry = gtk_entry_new ();                                       \
+       gtk_widget_show (entry);                                        \
+       gtk_table_attach (GTK_TABLE (table), entry, 1, 2, n, n + 1,     \
+                         GTK_EXPAND | GTK_SHRINK | GTK_FILL,           \
+                         GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);    \
+                                                                       \
+       button = gtk_button_new_with_label (_(" ... "));                \
+       gtk_widget_show (button);                                       \
+       gtk_table_attach (GTK_TABLE (table), button,                    \
+                         2, 3, n, n + 1, GTK_FILL, 0, 0, 0);           \
+       gtk_signal_connect                                              \
+               (GTK_OBJECT (button), "clicked",                        \
+                GTK_SIGNAL_FUNC (prefs_account_select_folder_cb),      \
+                entry);                                                \
+                                                                       \
+       SET_TOGGLE_SENSITIVITY (chkbtn, entry);                         \
+       SET_TOGGLE_SENSITIVITY (chkbtn, button);                        \
+}
+
+       SET_CHECK_BTN_AND_ENTRY(_("Put sent messages in"),
+                               sent_folder_chkbtn, sent_folder_entry, 0);
+       SET_CHECK_BTN_AND_ENTRY(_("Put draft messages in"),
+                               draft_folder_chkbtn, draft_folder_entry, 1);
+       SET_CHECK_BTN_AND_ENTRY(_("Put deleted messages in"),
+                               trash_folder_chkbtn, trash_folder_entry, 2);
+
        advanced.smtpport_chkbtn        = checkbtn_smtpport;
        advanced.smtpport_entry         = entry_smtpport;
        advanced.popport_hbox           = hbox_popport;
@@ -1678,6 +1795,16 @@ static void prefs_account_advanced_create(void)
        advanced.tunnelcmd_entry        = entry_tunnelcmd;
        advanced.crosspost_chkbtn       = checkbtn_crosspost;
        advanced.crosspost_colormenu    = colormenu_crosspost;
+
+       advanced.imap_frame             = imap_frame;
+       advanced.imapdir_entry          = imapdir_entry;
+
+       advanced.sent_folder_chkbtn  = sent_folder_chkbtn;
+       advanced.sent_folder_entry   = sent_folder_entry;
+       advanced.draft_folder_chkbtn = draft_folder_chkbtn;
+       advanced.draft_folder_entry  = draft_folder_entry;
+       advanced.trash_folder_chkbtn = trash_folder_chkbtn;
+       advanced.trash_folder_entry  = trash_folder_entry;
 }
 
 static gint prefs_account_deleted(GtkWidget *widget, GdkEventAny *event,
@@ -1711,6 +1838,10 @@ static gint prefs_account_apply(void)
        protocol = GPOINTER_TO_INT
                (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
 
+       if (*gtk_entry_get_text(GTK_ENTRY(basic.acname_entry)) == '\0') {
+               alertpanel_error(_("Account name is not entered."));
+               return -1;
+       }
        if (*gtk_entry_get_text(GTK_ENTRY(basic.addr_entry)) == '\0') {
                alertpanel_error(_("Mail address is not entered."));
                return -1;
@@ -1763,17 +1894,19 @@ static void prefs_account_cancel(void)
        gtk_main_quit();
 }
 
-static void prefs_account_select_inbox_cb(void)
+static void prefs_account_select_folder_cb(GtkWidget *widget, gpointer data)
 {
        FolderItem *item;
-       gchar      *path;
+       gchar *id;
 
        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);
-       }       
+       if (item && item->path) {
+               id = folder_item_get_identifier(item);
+               if (id) {
+                       gtk_entry_set_text(GTK_ENTRY(data), id);
+                       g_free(id);
+               }
+       }
 }
 
 static void prefs_account_edit_custom_header(void)
@@ -1932,12 +2065,19 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                prefs_account_nntpauth_toggled
                        (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 (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+                                FALSE);
+               }
+
 #if USE_SSL
-               gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
+               gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
                gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
+               gtk_widget_set_sensitive(ssl.nntp_chkbtn, TRUE);
                gtk_widget_set_sensitive(ssl.send_frame, FALSE);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
@@ -1945,6 +2085,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_show(advanced.nntpport_hbox);
                gtk_widget_show(advanced.crosspost_chkbtn);
                gtk_widget_show(advanced.crosspost_colormenu);
+               gtk_widget_set_sensitive(advanced.imap_frame, FALSE);
                break;
        case A_LOCAL:
                gtk_widget_hide(basic.nntpserv_label);
@@ -1986,15 +2127,21 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.uid_entry,  TRUE);
                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);
 
+               if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+                                TRUE);
+               }
+
 #if USE_SSL
                gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
                gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
+               gtk_widget_set_sensitive(ssl.nntp_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.send_frame, TRUE);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
@@ -2002,6 +2149,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.nntpport_hbox);
                gtk_widget_hide(advanced.crosspost_chkbtn);
                gtk_widget_hide(advanced.crosspost_colormenu);
+               gtk_widget_set_sensitive(advanced.imap_frame, FALSE);
                break;
        case A_IMAP4:
                gtk_widget_hide(basic.nntpserv_label);
@@ -2045,15 +2193,21 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.uid_entry,  TRUE);
                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);
 
+               if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+                                FALSE);
+               }
+
 #if USE_SSL
                gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
                gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.imap_chkbtn, TRUE);
+               gtk_widget_set_sensitive(ssl.nntp_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.send_frame, TRUE);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
@@ -2061,6 +2215,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.nntpport_hbox);
                gtk_widget_hide(advanced.crosspost_chkbtn);
                gtk_widget_hide(advanced.crosspost_colormenu);
+               gtk_widget_set_sensitive(advanced.imap_frame, TRUE);
                break;
        case A_POP3:
        default:
@@ -2105,15 +2260,21 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(basic.uid_entry,  TRUE);
                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);
 
+               if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
+                                TRUE);
+               }
+
 #if USE_SSL
                gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
                gtk_widget_set_sensitive(ssl.pop_chkbtn, TRUE);
                gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
+               gtk_widget_set_sensitive(ssl.nntp_chkbtn, FALSE);
                gtk_widget_set_sensitive(ssl.send_frame, TRUE);
 #endif
                gtk_widget_show(advanced.popport_hbox);
@@ -2121,6 +2282,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.nntpport_hbox);
                gtk_widget_hide(advanced.crosspost_chkbtn);
                gtk_widget_hide(advanced.crosspost_colormenu);
+               gtk_widget_set_sensitive(advanced.imap_frame, FALSE);
                break;
        }