2005-11-18 [colin] 1.9.100cvs22
[claws.git] / src / prefs_account.c
index cdb1f88bdae8190c9a4d3fca7def48ae2f61ff82..484803da832b9eec4aa2affcf17f44e86b098bd5 100644 (file)
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,6 +27,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/filesel.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -37,6 +38,7 @@
 #include "main.h"
 #include "prefs_gtk.h"
 #include "prefs_account.h"
+#include "prefs_common.h"
 #include "prefs_customheader.h"
 #include "account.h"
 #include "mainwindow.h"
@@ -59,6 +61,10 @@ static gboolean new_account;
 static PrefsAccount tmp_ac_prefs;
 
 static GtkWidget *notebook;
+static GtkWidget *sigfile_radiobtn;
+static GtkWidget *sigcmd_radiobtn;
+static GtkWidget *entry_sigpath;
+static GtkWidget *signature_browse_button;
 
 static GSList *prefs_pages = NULL;
 
@@ -109,6 +115,8 @@ static struct Receive {
        
        GtkWidget *imap_frame;
        GtkWidget *imap_auth_type_optmenu;
+       GtkWidget *imapdir_label;
+       GtkWidget *imapdir_entry;
 
        GtkWidget *frame_maxarticle;
        GtkWidget *label_maxarticle;
@@ -144,6 +152,7 @@ static struct Compose {
 static struct Privacy {
        GtkWidget *default_privacy_system;
        GtkWidget *default_encrypt_chkbtn;
+       GtkWidget *default_encrypt_reply_chkbtn;
        GtkWidget *default_sign_chkbtn;
        GtkWidget *save_clear_text_chkbtn;
 } privacy;
@@ -192,8 +201,6 @@ static struct Advanced {
 
        GtkWidget *tunnelcmd_chkbtn;
        GtkWidget *tunnelcmd_entry;
-       GtkWidget *imapdir_label;
-       GtkWidget *imapdir_entry;
 
        GtkWidget *sent_folder_chkbtn;
        GtkWidget *sent_folder_entry;
@@ -373,8 +380,8 @@ static PrefParam param[] = {
         &compose.sigfile_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,
         prefs_account_enum_set_radiobtn},
-       {"signature_path", "~/"DEFAULT_SIGNATURE, &tmp_ac_prefs.sig_path, P_STRING,
-        &compose.entry_sigpath,
+       {"signature_path", "~" G_DIR_SEPARATOR_S DEFAULT_SIGNATURE,
+        &tmp_ac_prefs.sig_path, P_STRING, &compose.entry_sigpath,
         prefs_set_data_from_entry, prefs_set_entry},
 
        {"auto_signature", "TRUE", &tmp_ac_prefs.auto_sig, P_BOOL,
@@ -416,6 +423,9 @@ static PrefParam param[] = {
        {"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL,
         &privacy.default_encrypt_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"default_encrypt_reply", "TRUE", &tmp_ac_prefs.default_encrypt_reply, P_BOOL,
+        &privacy.default_encrypt_reply_chkbtn,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
         &privacy.default_sign_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -446,6 +456,19 @@ static PrefParam param[] = {
        {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
         &ssl.use_nonblocking_ssl_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
+#else
+       /* SSL */
+       {"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
+        NULL, NULL, NULL},
+       {"ssl_imap", "0", &tmp_ac_prefs.ssl_imap, P_ENUM,
+        NULL, NULL, NULL},
+       {"ssl_nntp", "0", &tmp_ac_prefs.ssl_nntp, P_ENUM,
+        NULL, NULL, NULL},
+       {"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM,
+        NULL, NULL, NULL},
+
+       {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
+        NULL, NULL, NULL},
 #endif /* USE_OPENSSL */
 
        /* Advanced */
@@ -507,7 +530,7 @@ static PrefParam param[] = {
         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},
+        &receive.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,
@@ -556,20 +579,21 @@ static void prefs_account_advanced_create (void);
 static void prefs_account_select_folder_cb     (GtkWidget      *widget,
                                                 gpointer        data);
 
-static void pop_bfr_smtp_tm_set_sens           (GtkWidget      *widget,
+static void prefs_account_sigfile_radiobtn_cb  (GtkWidget      *widget,
                                                 gpointer        data);
 
-static void prefs_account_edit_custom_header   (void);
+static void prefs_account_sigcmd_radiobtn_cb   (GtkWidget      *widget,
+                                                gpointer        data);
 
-static gint prefs_account_deleted              (GtkWidget      *widget,
-                                                GdkEventAny    *event,
+static void prefs_account_signature_browse_cb  (GtkWidget      *widget,
                                                 gpointer        data);
-static gboolean prefs_account_key_pressed      (GtkWidget      *widget,
-                                                GdkEventKey    *event,
+
+static void pop_bfr_smtp_tm_set_sens           (GtkWidget      *widget,
                                                 gpointer        data);
-static void prefs_account_ok                   (void);
+
+static void prefs_account_edit_custom_header   (void);
+
 static gint prefs_account_apply                        (void);
-static void prefs_account_cancel               (void);
 
 typedef struct AccountPage
 {
@@ -590,6 +614,7 @@ static void privacy_system_activated(GtkMenuItem *menuitem)
        privacy_enabled = strcmp(system_id, "");
 
        gtk_widget_set_sensitive (privacy.default_encrypt_chkbtn, privacy_enabled);
+       gtk_widget_set_sensitive (privacy.default_encrypt_reply_chkbtn, privacy_enabled);
        gtk_widget_set_sensitive (privacy.default_sign_chkbtn, privacy_enabled);
        gtk_widget_set_sensitive (privacy.save_clear_text_chkbtn, privacy_enabled);
 }
@@ -736,7 +761,7 @@ PrefsAccount *prefs_account_new(void)
 
 void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
 {
-       const guchar *p = label;
+       const gchar *p = label;
        gchar *rcpath;
        gint id;
        gchar **strv, **cur;
@@ -752,7 +777,7 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
        g_free(rcpath);
 
        *ac_prefs = tmp_ac_prefs;
-       while (*p && !isdigit(*p)) p++;
+       while (*p && !g_ascii_isdigit(*p)) p++;
        id = atoi(p);
        if (id < 0) g_warning("wrong account id: %d\n", id);
        ac_prefs->account_id = id;
@@ -798,7 +823,7 @@ static void create_privacy_prefs(gpointer key, gpointer _value, gpointer user_da
 
        encvalue = g_malloc0(B64LEN(strlen(value)) + 1);
        base64_encode(encvalue, (gchar *) value, strlen(value));
-       g_string_sprintfa(str, "%s=%s", (gchar *) key, encvalue);
+       g_string_append_printf(str, "%s=%s", (gchar *) key, encvalue);
        g_free(encvalue);
 }
 
@@ -878,7 +903,7 @@ void prefs_account_set_privacy_prefs(PrefsAccount *account, gchar *id, gchar *ne
 {
        gchar *orig_key = NULL, *value;
 
-       if (g_hash_table_lookup_extended(account->privacy_prefs, id, (gpointer *) &orig_key, (gpointer *) &value)) {
+       if (g_hash_table_lookup_extended(account->privacy_prefs, id, (gpointer *)(gchar *) &orig_key, (gpointer *)(gchar *) &value)) {
                g_hash_table_remove(account->privacy_prefs, id);
 
                g_free(orig_key);
@@ -939,7 +964,8 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
                title = g_strdup_printf (_("%s - Account preferences"),
                                ac_prefs->account_name);
 
-       prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog);
+       prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog,
+                       &prefs_common.editaccountwin_width, &prefs_common.editaccountwin_height);
        g_free(title);
        gtk_main();
 
@@ -1173,14 +1199,14 @@ static void prefs_account_basic_create(void)
                (_("This server requires authentication"));
        gtk_widget_show (nntpauth_chkbtn);
        
-       gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 2, 1, 2,
+       gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 2, 6, 7,
                          GTK_FILL, 0, 0, 0);
 
        nntpauth_onconnect_chkbtn = gtk_check_button_new_with_label
                (_("Authenticate on connect"));
        gtk_widget_show (nntpauth_onconnect_chkbtn);
 
-       gtk_table_attach (GTK_TABLE (serv_table), nntpauth_onconnect_chkbtn, 2, 4, 1, 2,
+       gtk_table_attach (GTK_TABLE (serv_table), nntpauth_onconnect_chkbtn, 2, 4, 6, 7,
                          GTK_FILL, 0, 0, 0);
 
        recvserv_entry = gtk_entry_new ();
@@ -1332,6 +1358,9 @@ static void prefs_account_receive_create(void)
        GtkWidget *inbox_entry;
        GtkWidget *inbox_btn;
        GtkWidget *imap_frame;
+       GtkWidget *imapdir_label;
+       GtkWidget *imapdir_entry;
+
        GtkWidget *optmenu;
        GtkWidget *optmenu_menu;
        GtkWidget *menuitem;
@@ -1510,12 +1539,24 @@ static void prefs_account_receive_create(void)
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
 
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 4);
+
+       imapdir_label = gtk_label_new (_("IMAP server directory (usually empty)"));
+       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, FALSE, FALSE, 0);
+
        PACK_CHECK_BUTTON (vbox1, filter_on_recv_chkbtn,
                           _("Filter messages on receiving"));
 
        PACK_CHECK_BUTTON
                (vbox1, recvatgetall_chkbtn,
-                _("`Get all' checks for new messages on this account"));
+                _("'Get all' checks for new messages on this account"));
 
        receive.pop3_frame               = frame1;
        receive.use_apop_chkbtn          = use_apop_chkbtn;
@@ -1532,6 +1573,9 @@ static void prefs_account_receive_create(void)
        receive.imap_frame               = imap_frame;
        receive.imap_auth_type_optmenu   = optmenu;
 
+       receive.imapdir_label           = imapdir_label;
+       receive.imapdir_entry           = imapdir_entry;
+
        receive.recvatgetall_chkbtn      = recvatgetall_chkbtn;
 
        receive.frame_maxarticle        = frame2;
@@ -1741,12 +1785,9 @@ static void prefs_account_compose_create(void)
        GtkWidget *frame_sig;
        GtkWidget *vbox_sig;
        GtkWidget *label_sigpath;
-       GtkWidget *entry_sigpath;
        GtkWidget *checkbtn_autosig;
        GtkWidget *label_sigsep;
        GtkWidget *entry_sigsep;
-       GtkWidget *sigfile_radiobtn;
-       GtkWidget *sigcmd_radiobtn;
        GtkWidget *frame;
        GtkWidget *table;
        GtkWidget *autocc_chkbtn;
@@ -1795,6 +1836,8 @@ static void prefs_account_compose_create(void)
        g_object_set_data (G_OBJECT (sigfile_radiobtn),
                           MENU_VAL_ID,
                           GINT_TO_POINTER (SIG_FILE));
+       g_signal_connect(G_OBJECT(sigfile_radiobtn), "clicked",
+                        G_CALLBACK(prefs_account_sigfile_radiobtn_cb), NULL);
 
        sigcmd_radiobtn = gtk_radio_button_new_with_label_from_widget
                (GTK_RADIO_BUTTON(sigfile_radiobtn), _("Command output"));
@@ -1804,6 +1847,8 @@ static void prefs_account_compose_create(void)
        g_object_set_data (G_OBJECT (sigcmd_radiobtn),
                           MENU_VAL_ID,
                           GINT_TO_POINTER (SIG_COMMAND));
+       g_signal_connect(G_OBJECT(sigcmd_radiobtn), "clicked",
+                        G_CALLBACK(prefs_account_sigcmd_radiobtn_cb), NULL);
 
        hbox2 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox2);
@@ -1816,6 +1861,12 @@ static void prefs_account_compose_create(void)
        gtk_widget_show (entry_sigpath);
        gtk_box_pack_start (GTK_BOX (hbox2), entry_sigpath, TRUE, TRUE, 0);
 
+       signature_browse_button = gtkut_get_browse_file_btn(_("_Browse"));
+       gtk_widget_show (signature_browse_button);
+       gtk_box_pack_start (GTK_BOX (hbox2), signature_browse_button, FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT(signature_browse_button), "clicked",
+                        G_CALLBACK(prefs_account_signature_browse_cb), NULL);
+
        PACK_FRAME (vbox1, frame, _("Automatically set the following addresses"));
 
        table =  gtk_table_new (3, 2, FALSE);
@@ -1885,6 +1936,7 @@ static void prefs_account_privacy_create(void)
        GtkWidget *label;
        GtkWidget *default_privacy_system;
        GtkWidget *default_encrypt_chkbtn;
+       GtkWidget *default_encrypt_reply_chkbtn;
        GtkWidget *default_sign_chkbtn;
        GtkWidget *save_clear_text_chkbtn;
 
@@ -1911,6 +1963,9 @@ static void prefs_account_privacy_create(void)
 
        PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
                           _("Encrypt message by default"));
+       PACK_CHECK_BUTTON (vbox2, default_encrypt_reply_chkbtn,
+                          _("Encrypt message by default when replying to an "
+                            "encrypted message"));
        PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
                           _("Sign message by default"));
        PACK_CHECK_BUTTON (vbox2, save_clear_text_chkbtn,
@@ -1918,6 +1973,7 @@ static void prefs_account_privacy_create(void)
 
        privacy.default_privacy_system = default_privacy_system;
        privacy.default_encrypt_chkbtn = default_encrypt_chkbtn;
+       privacy.default_encrypt_reply_chkbtn = default_encrypt_reply_chkbtn;
        privacy.default_sign_chkbtn    = default_sign_chkbtn;
        privacy.save_clear_text_chkbtn = save_clear_text_chkbtn;
 }
@@ -2163,8 +2219,6 @@ static void prefs_account_advanced_create(void)
        GtkWidget *menu;
        GtkWidget *checkbtn_tunnelcmd;
        GtkWidget *entry_tunnelcmd;
-       GtkWidget *imapdir_label;
-       GtkWidget *imapdir_entry;
        GtkWidget *folder_frame;
        GtkWidget *vbox3;
        GtkWidget *table;
@@ -2258,14 +2312,6 @@ static void prefs_account_advanced_create(void)
        SET_TOGGLE_SENSITIVITY(checkbtn_crosspost, colormenu_crosspost);
 
        PACK_HBOX (hbox1);
-       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
 
@@ -2339,8 +2385,6 @@ static void prefs_account_advanced_create(void)
 
        advanced.tunnelcmd_chkbtn       = checkbtn_tunnelcmd;
        advanced.tunnelcmd_entry        = entry_tunnelcmd;
-       advanced.imapdir_label          = imapdir_label;
-       advanced.imapdir_entry          = imapdir_entry;
 
        advanced.sent_folder_chkbtn  = sent_folder_chkbtn;
        advanced.sent_folder_entry   = sent_folder_entry;
@@ -2352,33 +2396,14 @@ static void prefs_account_advanced_create(void)
        advanced.trash_folder_entry  = trash_folder_entry;
 }
 
-static gint prefs_account_deleted(GtkWidget *widget, GdkEventAny *event,
-                                 gpointer data)
-{
-       prefs_account_cancel();
-       return TRUE;
-}
-
-static gboolean prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                                         gpointer data)
-{
-       if (event && event->keyval == GDK_Escape)
-               prefs_account_cancel();
-       return FALSE;
-}
-
-static void prefs_account_ok(void)
-{
-       if (prefs_account_apply() == 0)
-               gtk_main_quit();
-}
-
 static gint prefs_account_apply(void)
 {
        RecvProtocol protocol;
        GtkWidget *menu;
        GtkWidget *menuitem;
-
+       gchar *old_id = NULL;
+       gchar *new_id = NULL;
+       
        menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(basic.protocol_optmenu));
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
        protocol = GPOINTER_TO_INT
@@ -2431,17 +2456,26 @@ static gint prefs_account_apply(void)
                alertpanel_error(_("mail command is not entered."));
                return -1;
        }
-
+       
+       if (protocol == A_IMAP4 || protocol == A_NNTP) 
+               old_id = g_strdup_printf("#%s/%s",
+                               protocol == A_IMAP4 ? "imap":"nntp",
+                               tmp_ac_prefs.account_name ? tmp_ac_prefs.account_name : "(null)");
+       
        prefs_set_data_from_dialog(param);
+       
+       if (protocol == A_IMAP4 || protocol == A_NNTP) {
+               new_id = g_strdup_printf("#%s/%s",
+                               protocol == A_IMAP4 ? "imap":"nntp",
+                               tmp_ac_prefs.account_name);
+               if (old_id != NULL && new_id != NULL)
+                       prefs_filtering_rename_path(old_id, new_id);
+               g_free(old_id);
+               g_free(new_id);
+       }
        return 0;
 }
 
-static void prefs_account_cancel(void)
-{
-       cancelled = TRUE;
-       gtk_main_quit();
-}
-
 static void pop_bfr_smtp_tm_set_sens(GtkWidget *widget, gpointer data)
 {
        gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, 
@@ -2463,6 +2497,33 @@ static void prefs_account_select_folder_cb(GtkWidget *widget, gpointer data)
        }
 }
 
+static void prefs_account_sigfile_radiobtn_cb(GtkWidget *widget, gpointer data)
+{
+       gtk_widget_set_sensitive(GTK_WIDGET(signature_browse_button), TRUE);
+}
+
+static void prefs_account_sigcmd_radiobtn_cb(GtkWidget *widget, gpointer data)
+{
+       gtk_widget_set_sensitive(GTK_WIDGET(signature_browse_button), FALSE);
+}
+
+static void prefs_account_signature_browse_cb(GtkWidget *widget, gpointer data)
+{
+       gchar *filename;
+       gchar *utf8_filename;
+
+       filename = filesel_select_file_open(_("Select signature file"), NULL);
+       if (!filename) return;
+
+       utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+       if (!utf8_filename) {
+               g_warning("prefs_account_signature_browse_cb(): failed to convert character set.");
+               utf8_filename = g_strdup(filename);
+       }
+       gtk_entry_set_text(GTK_ENTRY(entry_sigpath), utf8_filename);
+       g_free(utf8_filename);
+}
+
 static void prefs_account_edit_custom_header(void)
 {
        prefs_custom_header_open(&tmp_ac_prefs);
@@ -2740,6 +2801,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(receive.pop3_frame);
                gtk_widget_hide(receive.imap_frame);
                gtk_widget_show(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
                /* update pop_before_smtp sensitivity */
                gtk_toggle_button_set_active
@@ -2748,6 +2810,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
                
                if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), 
+                               TRUE);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
                                 FALSE);
@@ -2757,7 +2822,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(ssl.pop_frame);
                gtk_widget_hide(ssl.imap_frame);
                gtk_widget_show(ssl.nntp_frame);
-               gtk_widget_hide(ssl.send_frame);
+               gtk_widget_show(ssl.send_frame);
 #endif
                gtk_widget_hide(advanced.popport_hbox);
                gtk_widget_hide(advanced.imapport_hbox);
@@ -2766,8 +2831,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_show(advanced.crosspost_colormenu);
                gtk_widget_hide(advanced.tunnelcmd_chkbtn);
                gtk_widget_hide(advanced.tunnelcmd_entry);
-               gtk_widget_hide(advanced.imapdir_label);
-               gtk_widget_hide(advanced.imapdir_entry);
+               gtk_widget_hide(receive.imapdir_label);
+               gtk_widget_hide(receive.imapdir_entry);
                break;
        case A_LOCAL:
                gtk_widget_hide(basic.nntpserv_label);
@@ -2814,6 +2879,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(receive.pop3_frame);
                gtk_widget_hide(receive.imap_frame);
                gtk_widget_hide(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
                prefs_account_mailcmd_toggled
                        (GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
@@ -2825,6 +2891,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
 
                if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), 
+                               TRUE);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
                                 TRUE);
@@ -2843,8 +2912,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.crosspost_colormenu);
                gtk_widget_hide(advanced.tunnelcmd_chkbtn);
                gtk_widget_hide(advanced.tunnelcmd_entry);
-               gtk_widget_hide(advanced.imapdir_label);
-               gtk_widget_hide(advanced.imapdir_entry);
+               gtk_widget_hide(receive.imapdir_label);
+               gtk_widget_hide(receive.imapdir_entry);
                break;
        case A_IMAP4:
                gtk_widget_hide(basic.nntpserv_label);
@@ -2894,6 +2963,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(receive.pop3_frame);
                gtk_widget_show(receive.imap_frame);
                gtk_widget_hide(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, 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);
@@ -2905,6 +2975,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
 
                if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), 
+                               TRUE);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
                                 FALSE);
@@ -2923,8 +2996,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.crosspost_colormenu);
                gtk_widget_show(advanced.tunnelcmd_chkbtn);
                gtk_widget_show(advanced.tunnelcmd_entry);
-               gtk_widget_show(advanced.imapdir_label);
-               gtk_widget_show(advanced.imapdir_entry);
+               gtk_widget_show(receive.imapdir_label);
+               gtk_widget_show(receive.imapdir_entry);
                break;
        case A_NONE:
                gtk_widget_hide(basic.nntpserv_label);
@@ -2975,6 +3048,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(receive.pop3_frame);
                gtk_widget_hide(receive.imap_frame);
                gtk_widget_hide(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, FALSE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, FALSE);
 
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
@@ -2983,7 +3057,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                /* update pop_before_smtp sensitivity */
                gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
                pop_bfr_smtp_tm_set_sens(NULL, NULL);
-               
+       
+               gtk_toggle_button_set_active
+                       (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), FALSE);
                gtk_toggle_button_set_active
                        (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), FALSE);
 
@@ -3000,8 +3076,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.crosspost_colormenu);
                gtk_widget_hide(advanced.tunnelcmd_chkbtn);
                gtk_widget_hide(advanced.tunnelcmd_entry);
-               gtk_widget_hide(advanced.imapdir_label);
-               gtk_widget_hide(advanced.imapdir_entry);
+               gtk_widget_hide(receive.imapdir_label);
+               gtk_widget_hide(receive.imapdir_entry);
                break;
        case A_POP3:
        default:
@@ -3053,6 +3129,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_show(receive.pop3_frame);
                gtk_widget_hide(receive.imap_frame);
                gtk_widget_hide(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
 
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
@@ -3063,6 +3140,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                pop_bfr_smtp_tm_set_sens(NULL, NULL);
                
                if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), 
+                               TRUE);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
                                 TRUE);
@@ -3081,8 +3161,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(advanced.crosspost_colormenu);
                gtk_widget_hide(advanced.tunnelcmd_chkbtn);
                gtk_widget_hide(advanced.tunnelcmd_entry);
-               gtk_widget_hide(advanced.imapdir_label);
-               gtk_widget_hide(advanced.imapdir_entry);
+               gtk_widget_hide(receive.imapdir_label);
+               gtk_widget_hide(receive.imapdir_entry);
                break;
        }
 
@@ -3124,7 +3204,7 @@ void prefs_account_register_page(PrefsPage *page)
        prefs_pages = g_slist_append(prefs_pages, page);
 }
 
-void prefs_acount_unregister_page(PrefsPage *page)
+void prefs_account_unregister_page(PrefsPage *page)
 {
        prefs_pages = g_slist_remove(prefs_pages, page);
 }