clean
[claws.git] / src / prefs_common.c
index 37ea047a219dc722218155d8f854946e7abfd15d..4a6978c868a264f92b7a7494206d003eaf74fd4c 100644 (file)
@@ -66,10 +66,6 @@ static struct Receive {
        GtkWidget *entry_incext;
        GtkWidget *button_incext;
 
-       GtkWidget *checkbtn_local;
-       GtkWidget *checkbtn_filter_on_inc;
-       GtkWidget *entry_spool;
-
        GtkWidget *checkbtn_autochk;
        GtkWidget *spinbtn_autochk;
        GtkObject *spinbtn_autochk_adj;
@@ -88,10 +84,6 @@ static struct Receive {
 } receive;
 
 static struct Send {
-       GtkWidget *checkbtn_extsend;
-       GtkWidget *entry_extsend;
-       GtkWidget *button_extsend;
-
        GtkWidget *checkbtn_savemsg;
        GtkWidget *checkbtn_queuemsg;
        GtkWidget *optmenu_senddialog;
@@ -139,13 +131,6 @@ static struct Quote {
 } quote;
 
 static struct Display {
-       GtkWidget *entry_textfont;
-       GtkWidget *button_textfont;
-
-       GtkWidget *entry_smallfont;
-       GtkWidget *entry_normalfont;
-       GtkWidget *entry_boldfont;
-
        GtkWidget *chkbtn_folder_unread;
        GtkWidget *entry_ng_abbrev_len;
        GtkWidget *spinbtn_ng_abbrev_len;
@@ -180,7 +165,6 @@ static struct Message {
 #if USE_GPGME
 static struct Privacy {
        GtkWidget *checkbtn_auto_check_signatures;
-       GtkWidget *checkbtn_gpg_signature_popup;
        GtkWidget *checkbtn_store_passphrase;
        GtkWidget *spinbtn_store_passphrase;
        GtkObject *spinbtn_store_passphrase_adj;
@@ -197,8 +181,6 @@ static struct Interface {
        GtkWidget *checkbtn_openinbox;
        GtkWidget *checkbtn_immedexec;
        GtkWidget *optmenu_nextunreadmsgdialog;
-       GtkWidget *entry_pixmap_theme;
-       GtkWidget *combo_pixmap_theme;
 } interface;
 
 static struct Other {
@@ -239,8 +221,6 @@ static struct KeybindDialog {
        GtkWidget *combo;
 } keybind;
 
-static GtkWidget *font_sel_win;
-static guint font_sel_conn_id; 
 static GtkWidget *quote_color_win;
 static GtkWidget *color_dialog;
 
@@ -308,12 +288,6 @@ static PrefParam param[] = {
         prefs_set_data_from_toggle, prefs_set_toggle},
  
        /* Send */
-       {"use_ext_sendmail", "FALSE", &prefs_common.use_extsend, P_BOOL,
-        &p_send.checkbtn_extsend,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"ext_sendmail_cmd", DEFAULT_SENDMAIL_CMD,
-        &prefs_common.extsend_cmd, P_STRING,
-        &p_send.entry_extsend, prefs_set_data_from_entry, prefs_set_entry},
        {"save_message", "TRUE", &prefs_common.savemsg, P_BOOL,
         &p_send.checkbtn_savemsg,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -437,21 +411,13 @@ static PrefParam param[] = {
        {"widget_font", NULL, &prefs_common.widgetfont, P_STRING,
         NULL, NULL, NULL},
        {"message_font", "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
-        &prefs_common.textfont, P_STRING,
-        &display.entry_textfont,
-        prefs_set_data_from_entry, prefs_set_entry},
+        &prefs_common.textfont, P_STRING, NULL, NULL, NULL},
        {"small_font",   "-*-helvetica-medium-r-normal--10-*-*-*-*-*-*-*",
-        &prefs_common.smallfont,   P_STRING,
-        &display.entry_smallfont,
-        prefs_set_data_from_entry, prefs_set_entry},
+        &prefs_common.smallfont,   P_STRING, NULL, NULL, NULL},
        {"bold_font",    "-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*",
-        &prefs_common.boldfont,    P_STRING,
-        &display.entry_boldfont,
-        prefs_set_data_from_entry, prefs_set_entry},
+        &prefs_common.boldfont,    P_STRING, NULL, NULL, NULL},
        {"normal_font",  "-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*",
-        &prefs_common.normalfont,  P_STRING,
-        &display.entry_normalfont, 
-        prefs_set_data_from_entry, prefs_set_entry},
+        &prefs_common.normalfont,  P_STRING, NULL, NULL, NULL},
 
 
        {"display_folder_unread_num", "TRUE",
@@ -698,10 +664,6 @@ static PrefParam param[] = {
         &prefs_common.auto_check_signatures, P_BOOL,
         &privacy.checkbtn_auto_check_signatures,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"gpg_signature_popup", "FALSE",
-        &prefs_common.gpg_signature_popup, P_BOOL,
-        &privacy.checkbtn_gpg_signature_popup,
-        prefs_set_data_from_toggle, prefs_set_toggle},
        {"store_passphrase", "FALSE", &prefs_common.store_passphrase, P_BOOL,
         &privacy.checkbtn_store_passphrase,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -751,7 +713,7 @@ static PrefParam param[] = {
 
        {"pixmap_theme_path", DEFAULT_PIXMAP_THEME, 
         &prefs_common.pixmap_theme_path, P_STRING,
-        &interface.entry_pixmap_theme, prefs_set_data_from_entry, prefs_set_entry},
+        NULL, NULL, NULL},
 
        {"hover_timeout", "500", &prefs_common.hover_timeout, P_INT,
         NULL, NULL, NULL},
@@ -872,13 +834,6 @@ static void set_button_bg_color                    (GtkWidget      *widget,
 static void prefs_enable_message_color_toggled (void);
 static void prefs_recycle_colors_toggled       (GtkWidget      *widget);
 
-static void prefs_font_select  (GtkButton *button, GtkEntry *entry);
-
-static void prefs_font_selection_key_pressed   (GtkWidget      *widget,
-                                                GdkEventKey    *event,
-                                                gpointer        data);
-static void prefs_font_selection_ok            (GtkButton      *button, GtkEntry *entry);
-
 static void prefs_keybind_select               (void);
 static gint prefs_keybind_deleted              (GtkWidget      *widget,
                                                 GdkEventAny    *event,
@@ -1042,12 +997,6 @@ static void prefs_receive_create(void)
        GtkWidget *entry_incext;
        /* GtkWidget *button_incext; */
 
-       GtkWidget *frame_spool;
-       GtkWidget *checkbtn_local;
-       GtkWidget *checkbtn_filter_on_inc;
-       GtkWidget *label_spool;
-       GtkWidget *entry_spool;
-
        GtkWidget *hbox_autochk;
        GtkWidget *checkbtn_autochk;
        GtkWidget *label_autochk1;
@@ -1243,13 +1192,7 @@ static void prefs_send_create(void)
 {
        GtkWidget *vbox1;
        GtkWidget *vbox2;
-       GtkWidget *frame_extsend;
-       GtkWidget *vbox_extsend;
-       GtkWidget *checkbtn_extsend;
        GtkWidget *hbox1;
-       GtkWidget *label_extsend;
-       GtkWidget *entry_extsend;
-       /* GtkWidget *button_extsend; */
        GtkWidget *checkbtn_savemsg;
        GtkWidget *checkbtn_queuemsg;
        GtkWidget *label_outcharset;
@@ -1270,35 +1213,6 @@ static void prefs_send_create(void)
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-       PACK_FRAME(vbox1, frame_extsend, _("External program"));
-
-       vbox_extsend = gtk_vbox_new (FALSE, VSPACING_NARROW);
-       gtk_widget_show (vbox_extsend);
-       gtk_container_add (GTK_CONTAINER (frame_extsend), vbox_extsend);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox_extsend), 8);
-
-       PACK_CHECK_BUTTON (vbox_extsend, checkbtn_extsend,
-                          _("Use external program for sending"));
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox_extsend), hbox1, FALSE, FALSE, 0);
-       SET_TOGGLE_SENSITIVITY(checkbtn_extsend, hbox1);
-
-       label_extsend = gtk_label_new (_("Command"));
-       gtk_widget_show (label_extsend);
-       gtk_box_pack_start (GTK_BOX (hbox1), label_extsend, FALSE, FALSE, 0);
-
-       entry_extsend = gtk_entry_new ();
-       gtk_widget_show (entry_extsend);
-       gtk_box_pack_start (GTK_BOX (hbox1), entry_extsend, TRUE, TRUE, 0);
-
-#if 0
-       button_extsend = gtk_button_new_with_label ("... ");
-       gtk_widget_show (button_extsend);
-       gtk_box_pack_start (GTK_BOX (hbox1), button_extsend, FALSE, FALSE, 0);
-#endif
-
        vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
@@ -1309,7 +1223,6 @@ static void prefs_send_create(void)
                           _("Queue messages that fail to send"));
 
        hbox_senddialog = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox_senddialog, FALSE, FALSE, 0);
 
        label_senddialog = gtk_label_new (_("Show send dialog"));
@@ -1425,10 +1338,6 @@ static void prefs_send_create(void)
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
-       p_send.checkbtn_extsend = checkbtn_extsend;
-       p_send.entry_extsend    = entry_extsend;
-       /* p_send.button_extsend   = button_extsend; */
-
        p_send.checkbtn_savemsg  = checkbtn_savemsg;
        p_send.checkbtn_queuemsg = checkbtn_queuemsg;
        p_send.optmenu_senddialog = optmenu_senddialog;
@@ -1804,11 +1713,6 @@ static void prefs_quote_create(void)
 static void prefs_display_create(void)
 {
        GtkWidget *vbox1;
-       GtkWidget *frame_font;
-       GtkWidget *table1;
-       GtkWidget *label_textfont;
-       GtkWidget *entry_textfont;
-       GtkWidget *button_textfont;
        GtkWidget *chkbtn_transhdr;
        GtkWidget *chkbtn_folder_unread;
        GtkWidget *hbox1;
@@ -1825,99 +1729,12 @@ static void prefs_display_create(void)
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;
        GtkWidget *button_dispitem;
-       GtkWidget *tmplabel, *tmpbutton, *tmpentry;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-       PACK_FRAME(vbox1, frame_font, _("Font"));
-
-       table1 = gtk_table_new (4, 3, FALSE);
-
-       gtk_widget_show (table1);
-       gtk_container_add (GTK_CONTAINER (frame_font), table1);
-       gtk_container_set_border_width (GTK_CONTAINER (table1), 8);
-       gtk_table_set_row_spacings (GTK_TABLE (table1), 8);
-       gtk_table_set_col_spacings (GTK_TABLE (table1), 8);
-
-       label_textfont = gtk_label_new (_("Text"));
-       gtk_misc_set_alignment(GTK_MISC(label_textfont), 0, 0.5);
-       gtk_widget_show (label_textfont);
-       gtk_table_attach (GTK_TABLE (table1), label_textfont, 0, 1, 0, 1,
-                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
-
-       entry_textfont = gtk_entry_new ();
-       gtk_widget_show (entry_textfont);
-       gtk_table_attach (GTK_TABLE (table1), entry_textfont, 1, 2, 0, 1,
-                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
-
-       button_textfont = gtk_button_new_with_label (" ... ");
-
-       gtk_widget_show (button_textfont);
-       gtk_table_attach (GTK_TABLE (table1), button_textfont, 2, 3, 0, 1,
-                         0, 0, 0, 0);
-       gtk_signal_connect (GTK_OBJECT (button_textfont), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_font_select), entry_textfont);
-
-       tmplabel = gtk_label_new (_("Small"));
-       gtk_misc_set_alignment(GTK_MISC(tmplabel), 0, 0.5);
-       gtk_widget_show (tmplabel);
-       gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 1, 2,
-                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
-
-       tmpentry = gtk_entry_new ();
-       gtk_widget_show (tmpentry);
-       gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 1, 2,
-                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
-
-       tmpbutton = gtk_button_new_with_label (" ... ");
-       gtk_widget_show (tmpbutton);
-       gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 1, 2,
-                         0, 0, 0, 0);
-       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
-       display.entry_smallfont = tmpentry;                       
-
-       tmplabel = gtk_label_new (_("Normal"));
-       gtk_misc_set_alignment(GTK_MISC(tmplabel), 0, 0.5);
-       gtk_widget_show (tmplabel);
-       gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 2, 3,
-                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
-
-       tmpentry = gtk_entry_new ();
-       gtk_widget_show (tmpentry);
-       gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 2, 3,
-                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
-
-       tmpbutton = gtk_button_new_with_label (" ... ");
-       gtk_widget_show (tmpbutton);
-       gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 2, 3,
-                         0, 0, 0, 0);
-       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
-                               GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
-       display.entry_normalfont = tmpentry;                      
-
-       tmplabel = gtk_label_new (_("Bold"));
-       gtk_misc_set_alignment(GTK_MISC(tmplabel), 0, 0.5);
-       gtk_widget_show (tmplabel);
-       gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 3, 4,
-                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
-
-       tmpentry = gtk_entry_new ();
-       gtk_widget_show (tmpentry);
-       gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 3, 4,
-                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
-
-       tmpbutton = gtk_button_new_with_label (" ... ");
-       gtk_widget_show (tmpbutton);
-       gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 3, 4,
-                         0, 0, 0, 0);
-       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
-                               GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
-       display.entry_boldfont = tmpentry;
-
        vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, TRUE, 0);
@@ -2009,9 +1826,6 @@ static void prefs_display_create(void)
                            GTK_SIGNAL_FUNC (prefs_summary_column_open),
                            NULL);
 
-       display.entry_textfont  = entry_textfont;
-       display.button_textfont = button_textfont;
-
        display.chkbtn_transhdr           = chkbtn_transhdr;
        display.chkbtn_folder_unread      = chkbtn_folder_unread;
        display.spinbtn_ng_abbrev_len     = spinbtn_ng_abbrev_len;
@@ -2210,7 +2024,6 @@ static void prefs_privacy_create(void)
        GtkWidget *hbox_spc;
        GtkWidget *label;
        GtkWidget *checkbtn_auto_check_signatures;
-       GtkWidget *checkbtn_gpg_signature_popup;
        GtkWidget *checkbtn_store_passphrase;
        GtkObject *spinbtn_store_passphrase_adj;
        GtkWidget *spinbtn_store_passphrase;
@@ -2230,9 +2043,6 @@ static void prefs_privacy_create(void)
        PACK_CHECK_BUTTON (vbox2, checkbtn_auto_check_signatures,
                           _("Automatically check signatures"));
 
-       PACK_CHECK_BUTTON (vbox2, checkbtn_gpg_signature_popup,
-                          _("Show signature check result in a popup window"));
-
        PACK_CHECK_BUTTON (vbox2, checkbtn_store_passphrase,
                           _("Store passphrase in memory temporarily"));
 
@@ -2298,8 +2108,6 @@ static void prefs_privacy_create(void)
 
        privacy.checkbtn_auto_check_signatures
                                             = checkbtn_auto_check_signatures;
-       privacy.checkbtn_gpg_signature_popup
-                                            = checkbtn_gpg_signature_popup;
        privacy.checkbtn_store_passphrase    = checkbtn_store_passphrase;
        privacy.spinbtn_store_passphrase     = spinbtn_store_passphrase;
        privacy.spinbtn_store_passphrase_adj = spinbtn_store_passphrase_adj;
@@ -2330,12 +2138,6 @@ static void prefs_interface_create(void)
        GtkWidget *hbox_nextunreadmsgdialog;
        GtkWidget *optmenu_nextunreadmsgdialog;
 
-       GtkWidget *frame_pixmap_theme;
-       GtkWidget *vbox_pixmap_theme;
-       GtkWidget *entry_pixmap_theme;
-       GtkWidget *combo_pixmap_theme;
-       GList *avail_pixmap_themes = NULL;
-
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
@@ -2417,23 +2219,6 @@ static void prefs_interface_create(void)
        gtk_signal_connect (GTK_OBJECT (button_keybind), "clicked",
                            GTK_SIGNAL_FUNC (prefs_keybind_select), NULL);
 
-       PACK_FRAME(vbox1, frame_pixmap_theme, _("Icon theme"));
-       
-       vbox_pixmap_theme = gtk_vbox_new(FALSE, 0);
-       gtk_widget_show(vbox_pixmap_theme);
-       gtk_container_add(GTK_CONTAINER(frame_pixmap_theme), vbox_pixmap_theme);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox_pixmap_theme), 8);
-       avail_pixmap_themes = stock_pixmap_themes_list_new(); 
-       combo_pixmap_theme = gtk_combo_new ();
-       gtk_widget_show (combo_pixmap_theme);
-       gtk_box_pack_start (GTK_BOX (vbox_pixmap_theme), combo_pixmap_theme, TRUE, TRUE, 0);
-       gtk_combo_set_popdown_strings(GTK_COMBO(combo_pixmap_theme), avail_pixmap_themes);
-       entry_pixmap_theme = GTK_COMBO (combo_pixmap_theme)->entry;
-
-       stock_pixmap_themes_list_free(avail_pixmap_themes);
-
        /* interface.checkbtn_emacs          = checkbtn_emacs; */
        interface.checkbtn_always_show_msg    = checkbtn_always_show_msg;
        interface.checkbtn_openunread         = checkbtn_openunread;
@@ -2442,8 +2227,6 @@ static void prefs_interface_create(void)
        interface.checkbtn_openinbox          = checkbtn_openinbox;
        interface.checkbtn_immedexec          = checkbtn_immedexec;
        interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
-       interface.combo_pixmap_theme          = combo_pixmap_theme;
-       interface.entry_pixmap_theme          = entry_pixmap_theme;
 }
 
 static void prefs_other_create(void)
@@ -3316,75 +3099,6 @@ static void prefs_recycle_colors_toggled(GtkWidget *widget)
        prefs_common.recycle_quote_colors = is_active;
 }
 
-static void prefs_font_select(GtkButton *button, GtkEntry *entry)
-{
-       gchar *font_name;
-       
-       g_return_if_fail(entry != NULL);
-       
-       if (!font_sel_win) {
-               font_sel_win = gtk_font_selection_dialog_new
-                       (_("Font selection"));
-               gtk_window_position(GTK_WINDOW(font_sel_win),
-                                   GTK_WIN_POS_CENTER);
-               gtk_signal_connect(GTK_OBJECT(font_sel_win), "delete_event",
-                                  GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
-                                  NULL);
-               gtk_signal_connect
-                       (GTK_OBJECT(font_sel_win), "key_press_event",
-                        GTK_SIGNAL_FUNC(prefs_font_selection_key_pressed),
-                        NULL);
-               gtk_signal_connect_object
-                       (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->cancel_button),
-                        "clicked",
-                        GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
-                        GTK_OBJECT(font_sel_win));
-       }
-
-       if(font_sel_conn_id) {
-               gtk_signal_disconnect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button), font_sel_conn_id);
-       }
-       font_sel_conn_id = gtk_signal_connect
-               (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button),
-                "clicked",
-                GTK_SIGNAL_FUNC(prefs_font_selection_ok),
-                entry);
-       printf("%i\n", font_sel_conn_id);
-
-       font_name = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
-       gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_sel_win), font_name);
-       g_free(font_name);
-       manage_window_set_transient(GTK_WINDOW(font_sel_win));
-       gtk_window_set_modal(GTK_WINDOW(font_sel_win), TRUE);
-       gtk_widget_grab_focus
-               (GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button);
-       gtk_widget_show(font_sel_win);
-}
-
-static void prefs_font_selection_key_pressed(GtkWidget *widget,
-                                            GdkEventKey *event,
-                                            gpointer data)
-{
-       if (event && event->keyval == GDK_Escape)
-               gtk_widget_hide(font_sel_win);
-}
-
-static void prefs_font_selection_ok(GtkButton *button, GtkEntry *entry)
-{
-       gchar *fontname;
-
-       fontname = gtk_font_selection_dialog_get_font_name
-               (GTK_FONT_SELECTION_DIALOG(font_sel_win));
-
-       if (fontname) {
-               gtk_entry_set_text(entry, fontname);
-
-               g_free(fontname);
-       }
-
-       gtk_widget_hide(font_sel_win);
-}
-
 static void prefs_keybind_select(void)
 {
        GtkWidget *window;
@@ -3515,8 +3229,8 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
                "(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
 
-               "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
-               "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
+               "(menu-path \"<Main>/Message/Receive/Get new mail\" \"<control>I\")\n"
+               "(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><control>I\")\n"
                "(menu-path \"<Main>/Message/Compose an email message\" \"<control>M\")\n"
                "(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
                "(menu-path \"<Main>/Message/Reply to/all\" \"<shift><control>R\")\n"
@@ -3568,8 +3282,8 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/View/Show all headers\" \"<shift>H\")\n"
                "(menu-path \"<Main>/View/Update\" \"<shift>S\")\n"
 
-               "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
-               "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
+               "(menu-path \"<Main>/Message/Receive/Get new mail\" \"<control>I\")\n"
+               "(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><control>I\")\n"
                "(menu-path \"<Main>/Message/Compose an email message\" \"W\")\n"
                "(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
                "(menu-path \"<Main>/Message/Reply to/all\" \"<shift>A\")\n"
@@ -3620,9 +3334,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
                "(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
 
-               "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
-               "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
-               "(menu-path \"<Main>/Message/Compose new message\" \"M\")\n"
+               "(menu-path \"<Main>/Message/Receive/Get new mail\" \"<control>I\")\n"
+               "(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><control>I\")\n"
+               "(menu-path \"<Main>/Message/Compose an email message\" \"M\")\n"
                "(menu-path \"<Main>/Message/Reply\" \"R\")\n"
                "(menu-path \"<Main>/Message/Reply to/all\" \"G\")\n"
                "(menu-path \"<Main>/Message/Reply to/sender\" \"\")\n"
@@ -3673,8 +3387,8 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
                "(menu-path \"<Main>/View/Update\" \"<alt>U\")\n"
 
-               "(menu-path \"<Main>/Message/Get new mail\" \"<alt>I\")\n"
-               "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><alt>I\")\n"
+               "(menu-path \"<Main>/Message/Receive/Get new mail\" \"<alt>I\")\n"
+               "(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><alt>I\")\n"
                "(menu-path \"<Main>/Message/Compose an email message\" \"<alt>N\")\n"
                "(menu-path \"<Main>/Message/Reply\" \"<alt>R\")\n"
                "(menu-path \"<Main>/Message/Reply to/all\" \"<shift><alt>R\")\n"
@@ -3875,37 +3589,10 @@ static void prefs_common_ok(void)
 
 static void prefs_common_apply(void)
 {
-       gchar *entry_pixmap_theme_str;
-       gboolean update_pixmap_theme;
-       gchar *backup_theme_path;
        MainWindow *mainwindow;
-       
-       entry_pixmap_theme_str = gtk_entry_get_text(GTK_ENTRY(interface.entry_pixmap_theme));
-       if (entry_pixmap_theme_str && 
-               (strcmp(prefs_common.pixmap_theme_path, entry_pixmap_theme_str) != 0) )
-               update_pixmap_theme = TRUE;
-       else
-               update_pixmap_theme = FALSE;
-
-       /*!< FIXME: prefs_set_data_from_dialog() clears and frees all strings, 
-        * but prefs_common.pixmap_theme_path is stored in the StockPixmapData
-        * in stock_pixmap.c::pixmaps[].icon_path, and used when reflecting
-        * the pixmap changes. Work around by saving the old one and freeing 
-        * it later. */
-       backup_theme_path = prefs_common.pixmap_theme_path;
-       prefs_common.pixmap_theme_path = g_strdup(backup_theme_path);
+
        prefs_set_data_from_dialog(param);
        sock_set_io_timeout(prefs_common.io_timeout_secs);
-       
-       if (update_pixmap_theme) {
-               main_window_reflect_prefs_all_real(TRUE);
-               compose_reflect_prefs_pixmap_theme();
-       } else
-               main_window_reflect_prefs_all_real(FALSE);
-
-       /*!< FIXME: Now it's safe to delete the backup path */
-       g_free(backup_theme_path);
-
        prefs_common_save_config();
 
        mainwindow = mainwindow_get_mainwindow();