fix bug 4239, 'Preferences: Text Options Header Display modal is not modal' (sic)
[claws.git] / src / prefs_other.c
index a5cb7645ce45050b591b6b89eec2747e7e1f8814..30c18b9ee3fe3ac0f438e1b647892ff22862ec17 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2007 Colin Leroy <colin@colino.net> & The Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2019 Colin Leroy and The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
 
 #include "gtk/gtkutils.h"
 #include "gtk/prefswindow.h"
+#include "combobox.h"
+#ifndef PASSWORD_CRYPTO_OLD
+#include "password.h"
+#include "password_gtk.h"
+#endif
 
 #include "manage_window.h"
 #ifdef HAVE_LIBETPAN
@@ -53,14 +58,385 @@ typedef struct _OtherPage
        GtkWidget *checkbtn_cleanonexit;
        GtkWidget *checkbtn_askonclean;
        GtkWidget *checkbtn_warnqueued;
-        GtkWidget *checkbtn_cliplog;
-       GtkWidget *spinbtn_loglength;
        GtkWidget *spinbtn_iotimeout;
-       GtkWidget *chkbtn_never_send_retrcpt;
-       GtkWidget *chkbtn_gtk_can_change_accels;
+       GtkWidget *checkbtn_gtk_enable_accels;
+       GtkWidget *checkbtn_gtk_can_change_accels;
+       GtkWidget *checkbtn_askonfilter;
+       GtkWidget *checkbtn_use_shred;
+       GtkWidget *checkbtn_real_time_sync;
+       GtkWidget *flush_metadata_faster_radiobtn;
+       GtkWidget *flush_metadata_safer_radiobtn;
+       GtkWidget *checkbtn_transhdr;
+#ifndef PASSWORD_CRYPTO_OLD
+       GtkWidget *checkbtn_use_passphrase;
+#endif
 } OtherPage;
 
-void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window, 
+static struct KeybindDialog {
+       GtkWidget *window;
+       GtkWidget *combo;
+} keybind;
+
+static void prefs_keybind_select               (void);
+static gint prefs_keybind_deleted              (GtkWidget      *widget,
+                                                GdkEventAny    *event,
+                                                gpointer        data);
+static gboolean prefs_keybind_key_pressed      (GtkWidget      *widget,
+                                                GdkEventKey    *event,
+                                                gpointer        data);
+static void prefs_keybind_cancel               (void);
+static void prefs_keybind_apply_clicked                (GtkWidget      *widget);
+#ifndef PASSWORD_CRYPTO_OLD
+static void prefs_change_master_passphrase(GtkButton *button, gpointer data);
+static void prefs_use_passphrase_toggled(GtkToggleButton *button, gpointer data);
+#endif
+
+
+static void prefs_keybind_select(void)
+{
+       GtkWidget *window;
+       GtkWidget *vbox1;
+       GtkWidget *hbox1;
+       GtkWidget *label;
+       GtkWidget *combo;
+       GtkWidget *confirm_area;
+       GtkWidget *ok_btn;
+       GtkWidget *cancel_btn;
+
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_other");
+       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+       gtk_window_set_title (GTK_WINDOW (window), 
+                               _("Choose preset keyboard shortcuts"));
+       gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+       gtk_window_set_modal (GTK_WINDOW (window), TRUE);
+       gtk_window_set_resizable(GTK_WINDOW (window), FALSE);
+       gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+       manage_window_set_transient (GTK_WINDOW (window));
+
+       vbox1 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_container_add (GTK_CONTAINER (window), vbox1);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       label = gtk_label_new
+               (_("Select preset:"));
+       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
+       combo = combobox_text_new(FALSE,
+                              _("Default"),
+                              "Mew / Wanderlust",
+                              "Mutt",
+                              NULL);
+       gtk_box_pack_start (GTK_BOX (hbox1), combo, TRUE, TRUE, 0);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       label = gtk_label_new
+               (_("You can also modify each menu shortcut by pressing\n"
+                  "any key(s) when focusing the mouse pointer on the item."));
+       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+       gtkut_widget_set_small_font_size (label);
+
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       gtkut_stock_button_set_create (&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                      &ok_btn, GTK_STOCK_OK,
+                                      NULL, NULL);
+       gtk_box_pack_end (GTK_BOX (hbox1), confirm_area, FALSE, FALSE, 0);
+       gtk_widget_grab_focus (ok_btn);
+
+       MANAGE_WINDOW_SIGNALS_CONNECT(window);
+       g_signal_connect (G_OBJECT (window), "delete_event",
+                         G_CALLBACK (prefs_keybind_deleted), NULL);
+       g_signal_connect (G_OBJECT (window), "key_press_event",
+                         G_CALLBACK (prefs_keybind_key_pressed), NULL);
+       g_signal_connect (G_OBJECT (ok_btn), "clicked",
+                         G_CALLBACK (prefs_keybind_apply_clicked),
+                         NULL);
+       g_signal_connect (G_OBJECT (cancel_btn), "clicked",
+                         G_CALLBACK (prefs_keybind_cancel),
+                         NULL);
+
+       gtk_widget_show_all(window);
+
+       keybind.window = window;
+       keybind.combo = combo;
+}
+
+static gboolean prefs_keybind_key_pressed(GtkWidget *widget, GdkEventKey *event,
+                                         gpointer data)
+{
+       if (event && event->keyval == GDK_KEY_Escape)
+               prefs_keybind_cancel();
+       return FALSE;
+}
+
+static gint prefs_keybind_deleted(GtkWidget *widget, GdkEventAny *event,
+                                 gpointer data)
+{
+       prefs_keybind_cancel();
+       return TRUE;
+}
+
+static void prefs_keybind_cancel(void)
+{
+       gtk_widget_destroy(keybind.window);
+       keybind.window = NULL;
+       keybind.combo = NULL;
+}
+  
+struct KeyBind {
+       const gchar *accel_path;
+       const gchar *accel_key;
+};
+
+static void prefs_keybind_apply(struct KeyBind keybind[], gint num)
+{
+       gint i;
+       guint key;
+       GdkModifierType mods;
+
+       for (i = 0; i < num; i++) {
+               const gchar *accel_key
+                       = keybind[i].accel_key ? keybind[i].accel_key : "";
+               gtk_accelerator_parse(accel_key, &key, &mods);
+               if (key == 0 && mods == 0) {
+                       g_message("Failed parsing accelerator '%s' for path '%s'\n",
+                                 accel_key, keybind[i].accel_path);
+               }
+               gtk_accel_map_change_entry(keybind[i].accel_path,
+                                          key, mods, TRUE);
+       }
+}
+
+static void prefs_keybind_apply_clicked(GtkWidget *widget)
+{
+       gchar *text;
+       struct KeyBind *menurc;
+       gint n_menurc;
+
+       static struct KeyBind default_menurc[] = {
+               /* main */
+               {"<Actions>/Menu/File/EmptyTrashes",                    "<shift>D"},
+               {"<Actions>/Menu/File/SaveAs",                          "<control>S"},
+               {"<Actions>/Menu/File/Print",                           "<control>P"},
+               {"<Actions>/Menu/File/OfflineMode",                     "<control>W"},
+               {"<Actions>/Menu/File/SynchroniseFolders",              "<control><shift>S"},
+               {"<Actions>/Menu/File/Exit",                            "<control>Q"},
+
+               {"<Actions>/Menu/Edit/Copy",                            "<control>C"},
+               {"<Actions>/Menu/Edit/SelectAll",                       "<control>A"},
+               {"<Actions>/Menu/Edit/Find",                            "<control>F"},
+               {"<Actions>/Menu/Edit/SearchFolder",                    "<shift><control>F"},
+               {"<Actions>/Menu/Edit/QuickSearch",                     "slash"},
+
+               {"<Actions>/Menu/View/ShowHide/MessageView",            "V"},
+               {"<Actions>/Menu/View/ThreadView",                      "<control>T"},
+               {"<Actions>/Menu/View/Goto/Prev",                       "P"},
+               {"<Actions>/Menu/View/Goto/Next",                       "N"},
+               {"<Actions>/Menu/View/Goto/PrevUnread",                 "<shift>P"},
+               {"<Actions>/Menu/View/Goto/NextUnread",                 "<shift>N"},
+               {"<Actions>/Menu/View/Goto/Folder",                     "G"},
+               {"<Actions>/Menu/View/OpenNewWindow",                   "<control><alt>N"},
+               {"<Actions>/Menu/View/MessageSource",                   "<control>U"},
+               {"<Actions>/Menu/View/AllHeaders",                      "<control>H"},
+               {"<Actions>/Menu/View/UpdateSummary",                   "<control><alt>U"},
+
+               {"<Actions>/Menu/Message/Receive/CurrentAccount",
+                                                                       "<control>I"},
+               {"<Actions>/Menu/Message/Receive/AllAccounts",          "<shift><control>I"},
+               {"<Actions>/Menu/Message/ComposeEmail",                 "<control>M"},
+               {"<Actions>/Menu/Message/Reply",                        "<control>R"},
+               {"<Actions>/Menu/Message/ReplyTo/All",                  "<shift><control>R"},
+               {"<Actions>/Menu/Message/ReplyTo/Sender",               ""},
+               {"<Actions>/Menu/Message/ReplyTo/List",                 "<control>L"},
+               {"<Actions>/Menu/Message/Forward",                      "<control><alt>F"},
+               {"<Actions>/Menu/Message/Move",                         "<control>O"},
+               {"<Actions>/Menu/Message/Copy",                         "<shift><control>O"},
+               {"<Actions>/Menu/Message/Trash",                        "<control>D"},
+               {"<Actions>/Menu/Message/Mark/Mark",                    "<shift>asterisk"},
+               {"<Actions>/Menu/Message/Mark/Unmark",                  "U"},
+               {"<Actions>/Menu/Message/Mark/MarkUnread",              "<shift>exclam"},
+               {"<Actions>/Menu/Message/Mark/MarkRead",                ""},
+
+               {"<Actions>/Menu/Tools/AddressBook",                    "<shift><control>A"},
+               {"<Actions>/Menu/Tools/Execute",                        "X"},
+               {"<Actions>/Menu/Tools/NetworkLog",                     "<shift><control>L"},
+               /* compose */
+               {"<Actions>/Menu/Message/Send",                         "<control>Return"},
+               {"<Actions>/Menu/Message/SendLater",                    "<shift><control>S"},
+               {"<Actions>/Menu/Message/AttachFile",                   "<control>M"},
+               {"<Actions>/Menu/Message/InsertFile",                   "<control>I"},
+               {"<Actions>/Menu/Message/InsertSig",                    "<control>G"},
+               {"<Actions>/Menu/Message/Save",                         "<control>S"},
+               {"<Actions>/Menu/Message/Close",                        "<control>W"},
+               {"<Actions>/Menu/Edit/Undo",                            "<control>Z"},
+               {"<Actions>/Menu/Edit/Redo",                            "<control>Y"},
+               {"<Actions>/Menu/Edit/Cut",                             "<control>X"},
+               {"<Actions>/Menu/Edit/Copy",                            "<control>C"},
+               {"<Actions>/Menu/Edit/Paste",                           "<control>V"},
+               {"<Actions>/Menu/Edit/SelectAll",                       "<control>A"},
+               {"<Actions>/Menu/Edit/Advanced/BackChar",               "<control>B"},
+               {"<Actions>/Menu/Edit/Advanced/ForwChar",               "<control>F"},
+               {"<Actions>/Menu/Edit/Advanced/BackWord",               ""},
+               {"<Actions>/Menu/Edit/Advanced/ForwWord",               ""},
+               {"<Actions>/Menu/Edit/Advanced/BegLine",                ""},
+               {"<Actions>/Menu/Edit/Advanced/EndLine",                "<control>E"},
+               {"<Actions>/Menu/Edit/Advanced/PrevLine",               "<control>P"},
+               {"<Actions>/Menu/Edit/Advanced/NextLine",               "<control>N"},
+               {"<Actions>/Menu/Edit/Advanced/DelBackChar",            "<control>H"},
+               {"<Actions>/Menu/Edit/Advanced/DelForwChar",            "<control>D"},
+               {"<Actions>/Menu/Edit/Advanced/DelBackWord",            ""},
+               {"<Actions>/Menu/Edit/Advanced/DelForwWord",            ""},
+               {"<Actions>/Menu/Edit/Advanced/DelLine",                "<control>U"},
+               {"<Actions>/Menu/Edit/Advanced/DelEndLine",             "<control>K"},
+               {"<Actions>/Menu/Edit/WrapPara",                        "<control>L"},
+               {"<Actions>/Menu/Edit/WrapAllLines",                    "<control><alt>L"},
+               {"<Actions>/Menu/Edit/AutoWrap",                        "<shift><control>L"},
+               {"<Actions>/Menu/Edit/ExtEditor",                       "<shift><control>X"},
+               {"<Actions>/Menu/Tools/AddressBook",                    "<shift><control>A"},
+       };
+
+       static struct KeyBind mew_wl_menurc[] = {
+               /* main */
+               {"<Actions>/Menu/File/EmptyTrashes",                    "<shift>D"},
+               {"<Actions>/Menu/File/SaveAs",                          "Y"},
+               {"<Actions>/Menu/File/Print",                           "<control>numbersign"},
+               {"<Actions>/Menu/File/Exit",                            "<shift>Q"},
+
+               {"<Actions>/Menu/Edit/Copy",                            "<control>C"},
+               {"<Actions>/Menu/Edit/SelectAll",                       "<control>A"},
+               {"<Actions>/Menu/Edit/Find",                            "<control>F"},
+               {"<Actions>/Menu/Edit/SearchFolder",                    "<control>S"},
+               {"<Actions>/Menu/Edit/QuickSearch",                     "slash"},
+
+               {"<Actions>/Menu/View/ShowHide/MessageView",            ""},
+               {"<Actions>/Menu/View/ThreadView",                      "<shift>T"},
+               {"<Actions>/Menu/View/Goto/Prev",                       "P"},
+               {"<Actions>/Menu/View/Goto/Next",                       "N"},
+               {"<Actions>/Menu/View/Goto/PrevUnread",                 "<shift>P"},
+               {"<Actions>/Menu/View/Goto/NextUnread",                 "<shift>N"},
+               {"<Actions>/Menu/View/Goto/Folder",                     "G"},
+               {"<Actions>/Menu/View/OpenNewWindow",                   "<control><alt>N"},
+               {"<Actions>/Menu/View/MessageSource",                   "<control>U"},
+               {"<Actions>/Menu/View/AllHeaders",                      "<shift>H"},
+               {"<Actions>/Menu/View/UpdateSummary",                   "<shift>S"},
+
+               {"<Actions>/Menu/Message/Receive/CurrentAccount",
+                                                                       "<control>I"},
+               {"<Actions>/Menu/Message/Receive/AllAccounts",          "<shift><control>I"},
+               {"<Actions>/Menu/Message/ComposeEmail",                 "W"},
+               {"<Actions>/Menu/Message/Reply",                        "<control>R"},
+               {"<Actions>/Menu/Message/ReplyTo/All",                  "<shift>A"},
+               {"<Actions>/Menu/Message/ReplyTo/Sender",               ""},
+               {"<Actions>/Menu/Message/ReplyTo/List",                 "<control>L"},
+               {"<Actions>/Menu/Message/Forward",                      "F"},
+               {"<Actions>/Menu/Message/Move",                         "O"},
+               {"<Actions>/Menu/Message/Copy",                         "<shift>O"},
+               {"<Actions>/Menu/Message/Trash",                        "D"},
+               {"<Actions>/Menu/Message/Mark/Mark",                    "<shift>asterisk"},
+               {"<Actions>/Menu/Message/Mark/Unmark",                  "U"},
+               {"<Actions>/Menu/Message/Mark/MarkUnread",              "<shift>exclam"},
+               {"<Actions>/Menu/Message/Mark/MarkRead",                "<shift>R"},
+
+               {"<Actions>/Menu/Tools/AddressBook",                    "<shift><control>A"},
+               {"<Actions>/Menu/Tools/Execute",                        "X"},
+               {"<Actions>/Menu/Tools/NetworkLog",                     "<shift><control>L"},
+               /* compose */
+               {"<Actions>/Menu/Message/Close",                        "<alt>W"},
+               {"<Actions>/Menu/Edit/SelectAll",                       ""},
+               {"<Actions>/Menu/Edit/Advanced/BackChar",               "<alt>B"},
+               {"<Actions>/Menu/Edit/Advanced/ForwChar",               "<alt>F"},
+               {"<Actions>/Menu/Edit/Advanced/BackWord",               ""},
+               {"<Actions>/Menu/Edit/Advanced/ForwWord",               ""},
+               {"<Actions>/Menu/Edit/Advanced/BegLine",                "<control>A"},
+               {"<Actions>/Menu/Edit/Advanced/DelBackWord",            "<control>W"},
+               {"<Actions>/Menu/Edit/Advanced/DelForwWord",            "<alt>D"},
+       };
+
+       static struct KeyBind mutt_menurc[] = {
+               /* main */
+               {"<Actions>/Menu/File/SaveAs",                          "S"}, /* save-message */
+               {"<Actions>/Menu/File/Print",                           "P"}, /* print-message */
+               {"<Actions>/Menu/File/Exit",                            "Q"}, /* quit */
+
+               {"<Actions>/Menu/Edit/Copy",                            "<control>C"}, /* - */
+               {"<Actions>/Menu/Edit/SelectAll",                       "<control>A"}, /* - */
+               {"<Actions>/Menu/Edit/Find",                            "<alt>B"}, /* <esc>B: search in message bodies */
+               {"<Actions>/Menu/Edit/SearchFolder",                    "slash"}, /* search */
+               {"<Actions>/Menu/Edit/QuickSearch",                     "L"}, /* limit */
+
+               {"<Actions>/Menu/View/ShowHide/MessageView",            "V"}, /* - */
+               {"<Actions>/Menu/View/ThreadView",                      "<control>T"}, /* - */
+               {"<Actions>/Menu/View/Goto/Prev",                       "K"}, /* previous-entry */
+               {"<Actions>/Menu/View/Goto/Next",                       "J"}, /* next-entry */
+               {"<Actions>/Menu/View/Goto/PrevUnread",                 "<alt>U"}, /* <esc>Tab: previous-new-then-unread */
+               {"<Actions>/Menu/View/Goto/NextUnread",                 "U"}, /* Tab: next-new-then-unread */
+               {"<Actions>/Menu/View/Goto/Folder",                     "C"}, /* change-folder */
+               {"<Actions>/Menu/View/OpenNewWindow",                   "<control><alt>N"}, /* - */
+               {"<Actions>/Menu/View/MessageSource",                   "E"}, /* edit the raw message */
+               {"<Actions>/Menu/View/AllHeaders",                      "H"}, /* display-toggle-weed */
+               {"<Actions>/Menu/View/UpdateSummary",                   "<control><alt>U"}, /* - */
+
+               {"<Actions>/Menu/Message/Receive/CurrentAccount",       "<control>I"}, /* - */
+               {"<Actions>/Menu/Message/Receive/AllAccounts",          "<shift>G"}, /* fetch-mail */
+               {"<Actions>/Menu/Message/ComposeEmail",                 "M"}, /* mail */
+               {"<Actions>/Menu/Message/Reply",                        "R"}, /* reply */
+               {"<Actions>/Menu/Message/ReplyTo/All",                  "G"}, /* group-reply */
+               {"<Actions>/Menu/Message/ReplyTo/List",                 "<shift>L"}, /* list-reply */
+               {"<Actions>/Menu/Message/Forward",                      "F"}, /* forward-message */
+               {"<Actions>/Menu/Message/Move",                         "<control>O"}, /* - */
+               {"<Actions>/Menu/Message/Copy",                         "<shift>C"}, /* copy-message */
+               {"<Actions>/Menu/Message/Trash",                        "D"}, /* delete-message */
+               {"<Actions>/Menu/Message/Mark/Mark",                    "<shift>F"}, /* flag-message */
+               {"<Actions>/Menu/Message/Mark/Unmark",                  "<control><shift>F"}, /* - */
+               {"<Actions>/Menu/Message/Mark/MarkUnread",              "<shift>N"}, /* toggle-new */
+               {"<Actions>/Menu/Message/Mark/MarkRead",                "<control>R"}, /* read-thread */
+
+               {"<Actions>/Menu/Tools/AddressBook",                    "<shift><control>A"}, /* - */
+               {"<Actions>/Menu/Tools/Execute",                        "dollar"}, /* sync-mailbox */
+               {"<Actions>/Menu/Tools/NetworkLog",                     "<shift><control>L"}, /* - */
+               /* compose */
+               {"<Actions>/Menu/Message/Close",                        "<alt>W"}, /* - */
+               {"<Actions>/Menu/Edit/Advanced/BackWord",               "<alt>B"}, /* - */
+               {"<Actions>/Menu/Edit/Advanced/ForwWord",               "<alt>F"}, /* - */
+               {"<Actions>/Menu/Edit/Advanced/BegLine",                "<control>A"}, /* - */
+               {"<Actions>/Menu/Edit/Advanced/DelBackWord",            "<control>W"}, /* - */
+               {"<Actions>/Menu/Edit/Advanced/DelForwWord",            "<alt>D"}, /* - */
+       };
+
+       text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(keybind.combo));
+
+       if (!strcmp(text, _("Default"))) {
+               menurc = default_menurc;
+               n_menurc = G_N_ELEMENTS(default_menurc);
+       } else if (!strcmp(text, "Mew / Wanderlust")) {
+               menurc = mew_wl_menurc;
+               n_menurc = G_N_ELEMENTS(mew_wl_menurc);
+       } else if (!strcmp(text, "Mutt")) {
+               menurc = mutt_menurc;
+               n_menurc = G_N_ELEMENTS(mutt_menurc);
+       } else {
+               g_free(text);
+               return;
+       }
+       g_free(text);
+
+       prefs_keybind_apply(menurc, n_menurc);
+
+       gtk_widget_destroy(keybind.window);
+       keybind.window = NULL;
+       keybind.combo = NULL;
+}
+
+static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window, 
                                  gpointer data)
 {
        OtherPage *prefs_other = (OtherPage *) _page;
@@ -72,30 +448,43 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *vbox_addr;
        GtkWidget *checkbtn_addaddrbyclick;
        
-       GtkWidget *frame_cliplog;
-       GtkWidget *vbox_cliplog;
-       GtkWidget *hbox_cliplog;
-       GtkWidget *checkbtn_cliplog;
-       GtkWidget *loglength_label;
-       GtkWidget *spinbtn_loglength;
-       GtkObject *spinbtn_loglength_adj;
-       GtkTooltips *loglength_tooltip;
-       GtkWidget *label;
-
        GtkWidget *frame_exit;
        GtkWidget *vbox_exit;
        GtkWidget *checkbtn_confonexit;
        GtkWidget *checkbtn_cleanonexit;
-       GtkWidget *checkbtn_askonclean;
        GtkWidget *checkbtn_warnqueued;
 
+       GtkWidget *frame_keys;
+       GtkWidget *vbox_keys;
+       GtkWidget *checkbtn_gtk_enable_accels;
+       GtkWidget *checkbtn_gtk_can_change_accels;
+       GtkWidget *button_keybind;
+
        GtkWidget *label_iotimeout;
        GtkWidget *spinbtn_iotimeout;
-       GtkObject *spinbtn_iotimeout_adj;
+       GtkAdjustment *spinbtn_iotimeout_adj;
 
-       GtkWidget *chkbtn_never_send_retrcpt;
-       GtkWidget *chkbtn_gtk_can_change_accels;
-       GtkTooltips *gtk_can_change_accels_tooltip;
+       GtkWidget *vbox2;
+       GtkWidget *checkbtn_transhdr;
+       GtkWidget *checkbtn_askonclean;
+       GtkWidget *checkbtn_askonfilter;
+       GtkWidget *checkbtn_use_shred;
+       GtkWidget *checkbtn_real_time_sync;
+
+       GtkWidget *frame_metadata;
+       GtkWidget *vbox_metadata;
+       GtkWidget *metadata_label;
+       GtkWidget *flush_metadata_faster_radiobtn;
+       GtkWidget *flush_metadata_safer_radiobtn;
+
+#ifndef PASSWORD_CRYPTO_OLD
+       GtkWidget *vbox_passphrase;
+       GtkWidget *frame_passphrase;
+       GtkWidget *checkbtn_use_passphrase;
+       GtkWidget *button_change_passphrase;
+#endif
+
+       gchar *shred_binary = NULL;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -107,43 +496,6 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
                (vbox_addr, checkbtn_addaddrbyclick,
                 _("Add address to destination when double-clicked"));
 
-       /* Clip Log */
-       vbox_cliplog = gtkut_get_options_frame(vbox1, &frame_cliplog, _("Log Size"));
-
-       PACK_CHECK_BUTTON (vbox_cliplog, checkbtn_cliplog,
-                          _("Clip the log size"));
-       hbox_cliplog = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox_cliplog), hbox_cliplog);
-       gtk_widget_show (hbox_cliplog);
-       
-       loglength_label = gtk_label_new (_("Log window length"));
-       gtk_box_pack_start (GTK_BOX (hbox_cliplog), loglength_label,
-                           FALSE, TRUE, 0);
-       gtk_widget_show (GTK_WIDGET (loglength_label));
-       
-       loglength_tooltip = gtk_tooltips_new();
-
-       spinbtn_loglength_adj = gtk_adjustment_new (500, 0, G_MAXINT, 1, 10, 10);
-       spinbtn_loglength = gtk_spin_button_new
-               (GTK_ADJUSTMENT (spinbtn_loglength_adj), 1, 0);
-       gtk_widget_show (spinbtn_loglength);
-       gtk_box_pack_start (GTK_BOX (hbox_cliplog), spinbtn_loglength,
-                           FALSE, FALSE, 0);
-       gtk_widget_set_size_request (GTK_WIDGET (spinbtn_loglength), 64, -1);
-       gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_loglength), TRUE);
-
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(loglength_tooltip), spinbtn_loglength,
-                            _("0 to stop logging in the log window"),
-                            NULL);
-
-       label = gtk_label_new(_("lines"));
-       gtk_widget_show (label);
-       gtk_box_pack_start(GTK_BOX(hbox_cliplog), label, FALSE, FALSE, 0);
-
-       SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, loglength_label);
-       SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, spinbtn_loglength);
-       SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, label);
-
        /* On Exit */
        vbox_exit = gtkut_get_options_frame(vbox1, &frame_exit, _("On exit"));
 
@@ -156,13 +508,57 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
 
        PACK_CHECK_BUTTON (hbox1, checkbtn_cleanonexit,
                           _("Empty trash on exit"));
-       PACK_CHECK_BUTTON (hbox1, checkbtn_askonclean,
-                          _("Ask before emptying"));
-       SET_TOGGLE_SENSITIVITY (checkbtn_cleanonexit, checkbtn_askonclean);
 
        PACK_CHECK_BUTTON (vbox_exit, checkbtn_warnqueued,
                           _("Warn if there are queued messages"));
 
+       vbox_keys = gtkut_get_options_frame(vbox1, &frame_keys, _("Keyboard shortcuts"));
+
+       PACK_CHECK_BUTTON(vbox_keys, checkbtn_gtk_enable_accels,
+                       _("Enable keyboard shortcuts"));
+
+       PACK_CHECK_BUTTON(vbox_keys, checkbtn_gtk_can_change_accels,
+                       _("Enable customisable keyboard shortcuts"));
+
+       CLAWS_SET_TIP(checkbtn_gtk_can_change_accels,
+                       _("If checked, you can change the keyboard shortcuts of "
+                               "most of the menu items by focusing on the menu "
+                               "item and pressing a key combination.\n"
+                               "Uncheck this option if you want to lock all "
+                               "existing keyboard shortcuts."));
+
+       button_keybind = gtk_button_new_with_label(
+                               _(" Choose preset keyboard shortcuts... "));
+       gtk_widget_show (button_keybind);
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_keys), hbox1, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox1), button_keybind, FALSE, FALSE, 0);
+       g_signal_connect (G_OBJECT (button_keybind), "clicked",
+                         G_CALLBACK (prefs_keybind_select), NULL);
+
+
+       vbox_metadata = gtkut_get_options_frame(vbox1, &frame_metadata, _("Metadata handling"));
+       metadata_label = gtk_label_new(_("Safer mode asks the OS to write metadata to disk directly;\n"
+                                        "it avoids data loss after crashes but can take some time."));
+       gtk_misc_set_alignment(GTK_MISC(metadata_label), 0, 0);
+       gtk_box_pack_start (GTK_BOX (vbox_metadata), metadata_label, FALSE, FALSE, 0);
+       flush_metadata_safer_radiobtn = gtk_radio_button_new_with_label(NULL, _("Safer"));
+       flush_metadata_faster_radiobtn = gtk_radio_button_new_with_label_from_widget(
+                                          GTK_RADIO_BUTTON(flush_metadata_safer_radiobtn), _("Faster"));
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_metadata), hbox1, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox1), flush_metadata_safer_radiobtn, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox1), flush_metadata_faster_radiobtn, FALSE, FALSE, 0);
+       
+       if (prefs_common.flush_metadata)
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(flush_metadata_safer_radiobtn), TRUE);
+       else
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(flush_metadata_faster_radiobtn), TRUE);
+
+       gtk_widget_show_all(frame_metadata);
+
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
@@ -171,35 +567,76 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_iotimeout);
        gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
 
-       spinbtn_iotimeout_adj = gtk_adjustment_new (60, 0, 1000, 1, 10, 10);
+       spinbtn_iotimeout_adj = GTK_ADJUSTMENT(gtk_adjustment_new (60, 0, 1000, 1, 10, 0));
        spinbtn_iotimeout = gtk_spin_button_new
                (GTK_ADJUSTMENT (spinbtn_iotimeout_adj), 1, 0);
        gtk_widget_show (spinbtn_iotimeout);
        gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_iotimeout,
                            FALSE, FALSE, 0);
-       gtk_widget_set_size_request (spinbtn_iotimeout, 64, -1);
        gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_iotimeout), TRUE);
 
        label_iotimeout = gtk_label_new (_("seconds"));
        gtk_widget_show (label_iotimeout);
        gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON(vbox1, chkbtn_never_send_retrcpt,
-                         _("Never send Return Receipts"));
-
-       PACK_CHECK_BUTTON(vbox1, chkbtn_gtk_can_change_accels,
-                       _("Enable customisable menu shortcuts"));
-
-       gtk_can_change_accels_tooltip = gtk_tooltips_new();
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(gtk_can_change_accels_tooltip),
-                       chkbtn_gtk_can_change_accels,
-                       _("Please restart claws-mail to apply the change !\n"
-                               "If checked, you can change shortcuts of most "
-                               "of menu items by pressing a key combination over "
-                               "them (the shortcut is automatically set).\n"
-                               "You can uncheck this if you want to lock all "
-                               "existing menu shortcuts."),
-                       NULL);
+       vbox2 = gtk_vbox_new (FALSE, 8);
+       gtk_widget_show (vbox2);
+       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
+       PACK_CHECK_BUTTON(vbox2, checkbtn_transhdr,
+                          _("Translate header names"));
+       CLAWS_SET_TIP(checkbtn_transhdr,
+                            _("The display of standard headers (such as 'From:', 'Subject:') "
+                            "will be translated into your language."));
+       PACK_CHECK_BUTTON (vbox2, checkbtn_askonclean, 
+                          _("Ask before emptying trash"));
+       PACK_CHECK_BUTTON (vbox2, checkbtn_askonfilter,
+                          _("Ask about account specific filtering rules when "
+                            "filtering manually"));
+       shred_binary = g_find_program_in_path("shred");
+       if (shred_binary) {
+               PACK_CHECK_BUTTON (vbox2, checkbtn_use_shred,
+                                  _("Use secure file deletion if possible"));
+               g_free(shred_binary);
+       } else {
+               PACK_CHECK_BUTTON (vbox2, checkbtn_use_shred,
+                                  _("Use secure file deletion if possible\n"
+                                    "(the 'shred' program is not available)"));
+               gtk_widget_set_sensitive(checkbtn_use_shred, FALSE);
+       }
+       CLAWS_SET_TIP(checkbtn_use_shred,
+                       _("Use the 'shred' program to overwrite files with random data before "
+                         "deleting them. This slows down deletion. Be sure to "
+                         "read shred's man page for caveats."));
+       PACK_CHECK_BUTTON (vbox2, checkbtn_real_time_sync,
+                          _("Synchronise offline folders as soon as possible"));
+
+#ifndef PASSWORD_CRYPTO_OLD
+       vbox_passphrase = gtkut_get_options_frame(vbox1, &frame_passphrase, _("Master passphrase"));
+
+       PACK_CHECK_BUTTON(vbox_passphrase, checkbtn_use_passphrase,
+                       _("Use a master passphrase"));
+
+       CLAWS_SET_TIP(checkbtn_use_passphrase,
+                       _("If checked, your saved account passwords will be protected "
+                               "by a master passphrase. If no master passphrase is set, "
+                               "you will be prompted to set one."));
+
+       button_change_passphrase = gtk_button_new_with_label(
+                       _("Change master passphrase"));
+       gtk_widget_show (button_change_passphrase);
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox_passphrase), hbox1, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox1), button_change_passphrase,
+                       FALSE, FALSE, 0);
+       g_signal_connect (G_OBJECT (checkbtn_use_passphrase), "toggled",
+                               G_CALLBACK (prefs_use_passphrase_toggled), button_change_passphrase);
+       g_signal_connect (G_OBJECT (button_change_passphrase), "clicked",
+                         G_CALLBACK (prefs_change_master_passphrase), NULL);
+#endif
+       SET_TOGGLE_SENSITIVITY(checkbtn_gtk_enable_accels, checkbtn_gtk_can_change_accels);
+       SET_TOGGLE_SENSITIVITY(checkbtn_gtk_enable_accels, button_keybind);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_addaddrbyclick), 
                prefs_common.add_address_by_click);
@@ -211,36 +648,55 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
                prefs_common.ask_on_clean);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_warnqueued), 
                prefs_common.warn_queued_on_exit);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_cliplog), 
-               prefs_common.cliplog);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_never_send_retrcpt),
-               prefs_common.never_send_retrcpt);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_gtk_can_change_accels),
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_gtk_enable_accels),
+               prefs_common.gtk_enable_accels);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_gtk_can_change_accels),
                prefs_common.gtk_can_change_accels);
 
-       gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_loglength),
-               prefs_common.loglength);
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_iotimeout),
                prefs_common.io_timeout_secs);
 
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_transhdr),
+               prefs_common.trans_hdr);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_askonfilter), 
+               prefs_common.ask_apply_per_account_filtering_rules);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_use_shred), 
+               prefs_common.use_shred);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_real_time_sync), 
+               prefs_common.real_time_sync);
+
+#ifndef PASSWORD_CRYPTO_OLD
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_use_passphrase),
+               prefs_common.use_master_passphrase);
+       gtk_widget_set_sensitive(button_change_passphrase,
+                       prefs_common.use_master_passphrase);
+#endif
+
        prefs_other->checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
        prefs_other->checkbtn_confonexit = checkbtn_confonexit;
        prefs_other->checkbtn_cleanonexit = checkbtn_cleanonexit;
        prefs_other->checkbtn_askonclean = checkbtn_askonclean;
        prefs_other->checkbtn_warnqueued = checkbtn_warnqueued;
-       prefs_other->checkbtn_cliplog = checkbtn_cliplog;
-       prefs_other->spinbtn_loglength = spinbtn_loglength;
        prefs_other->spinbtn_iotimeout = spinbtn_iotimeout;
-       prefs_other->chkbtn_never_send_retrcpt = chkbtn_never_send_retrcpt;
-       prefs_other->chkbtn_gtk_can_change_accels = chkbtn_gtk_can_change_accels;
-
+       prefs_other->checkbtn_transhdr = checkbtn_transhdr;
+       prefs_other->checkbtn_gtk_enable_accels = checkbtn_gtk_enable_accels;
+       prefs_other->checkbtn_gtk_can_change_accels = checkbtn_gtk_can_change_accels;
+       prefs_other->checkbtn_askonfilter = checkbtn_askonfilter;
+       prefs_other->checkbtn_use_shred = checkbtn_use_shred;
+       prefs_other->checkbtn_real_time_sync = checkbtn_real_time_sync;
+       prefs_other->flush_metadata_safer_radiobtn = flush_metadata_safer_radiobtn;
+       prefs_other->flush_metadata_faster_radiobtn = flush_metadata_faster_radiobtn;
+#ifndef PASSWORD_CRYPTO_OLD
+       prefs_other->checkbtn_use_passphrase = checkbtn_use_passphrase;
+#endif
        prefs_other->page.widget = vbox1;
 }
 
-void prefs_other_save(PrefsPage *_page)
+static void prefs_other_save(PrefsPage *_page)
 {
        OtherPage *page = (OtherPage *) _page;
-       MainWindow *mainwindow;
+       gboolean gtk_enable_accels;
+       gboolean gtk_can_change_accels;
 
        prefs_common.add_address_by_click = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_addaddrbyclick));
@@ -252,24 +708,97 @@ void prefs_other_save(PrefsPage *_page)
                GTK_TOGGLE_BUTTON(page->checkbtn_askonclean));
        prefs_common.warn_queued_on_exit = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_warnqueued)); 
-       prefs_common.cliplog = gtk_toggle_button_get_active(
-               GTK_TOGGLE_BUTTON(page->checkbtn_cliplog));
-       prefs_common.loglength = gtk_spin_button_get_value_as_int(
-               GTK_SPIN_BUTTON(page->spinbtn_loglength));
        prefs_common.io_timeout_secs = gtk_spin_button_get_value_as_int(
                GTK_SPIN_BUTTON(page->spinbtn_iotimeout));
+       prefs_common.flush_metadata = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->flush_metadata_safer_radiobtn));
        sock_set_io_timeout(prefs_common.io_timeout_secs);
 #ifdef HAVE_LIBETPAN
        imap_main_set_timeout(prefs_common.io_timeout_secs);
 #endif
-       prefs_common.never_send_retrcpt = gtk_toggle_button_get_active(
-               GTK_TOGGLE_BUTTON(page->chkbtn_never_send_retrcpt));
-       prefs_common.gtk_can_change_accels = gtk_toggle_button_get_active(
-               GTK_TOGGLE_BUTTON(page->chkbtn_gtk_can_change_accels));
-       mainwindow = mainwindow_get_mainwindow();
-       log_window_set_clipping(mainwindow->logwin, prefs_common.cliplog,
-                               prefs_common.loglength);
+       prefs_common.trans_hdr = gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_transhdr));
+       prefs_common.ask_apply_per_account_filtering_rules = 
+               gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_askonfilter)); 
+       prefs_common.use_shred = 
+               gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_use_shred)); 
+       prefs_common.real_time_sync = 
+               gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_real_time_sync));
+
+#ifndef PASSWORD_CRYPTO_OLD
+       /* If we're disabling use of master passphrase, we need to reencrypt
+        * all account passwords with hardcoded key. */
+       if (!gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_use_passphrase))
+                       && master_passphrase_is_set()) {
+               master_passphrase_change(NULL, NULL);
+
+               /* In case user did not finish the passphrase change process
+                * (e.g. did not enter a correct current master passphrase),
+                * we need to enable the "use master passphrase" checkbox again,
+                * since the old master passphrase is still valid. */
+               if (master_passphrase_is_set()) {
+                       gtk_toggle_button_set_active(
+                               GTK_TOGGLE_BUTTON(page->checkbtn_use_passphrase), TRUE);
+               }
+       }
+
+       if (gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_use_passphrase))
+                       && !master_passphrase_is_set()) {
+               master_passphrase_change_dialog();
+
+               /* In case user cancelled the passphrase change dialog, we need
+                * to disable the "use master passphrase" checkbox. */
+               if (!master_passphrase_is_set()) {
+                       gtk_toggle_button_set_active(
+                               GTK_TOGGLE_BUTTON(page->checkbtn_use_passphrase), FALSE);
+               }
+       }
+
+       prefs_common.use_master_passphrase =
+               gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_use_passphrase));
+#endif
 
+       gtk_can_change_accels = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_gtk_can_change_accels));
+
+       if (prefs_common.gtk_can_change_accels != gtk_can_change_accels) {
+
+               prefs_common.gtk_can_change_accels = gtk_can_change_accels;
+
+               gtk_settings_set_long_property(gtk_settings_get_default(),
+                               "gtk-can-change-accels",
+                               (glong)prefs_common.gtk_can_change_accels,
+                               "XProperty");
+       }
+       gtk_enable_accels = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_gtk_enable_accels));
+
+       if (prefs_common.gtk_enable_accels != gtk_enable_accels) {
+               prefs_common.gtk_enable_accels = gtk_enable_accels;
+
+               gtk_settings_set_long_property(gtk_settings_get_default(),
+                               "gtk-enable-accels",
+                               (glong)prefs_common.gtk_enable_accels,
+                               "XProperty");
+               
+               gtk_settings_set_long_property(gtk_settings_get_default(),
+                               "gtk-enable-mnemonics",
+                               (glong)prefs_common.gtk_enable_accels,
+                               "XProperty");
+       }
+       
+       if (prefs_common.gtk_enable_accels != gtk_enable_accels ||
+           prefs_common.gtk_can_change_accels != gtk_can_change_accels) {              
+               /* gtk_can_change_accels value changed : we have (only if changed)
+                * to apply the gtk property to all widgets : */
+               gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE);
+       }
 }
 
 static void prefs_other_destroy_widget(PrefsPage *_page)
@@ -281,10 +810,11 @@ OtherPage *prefs_other;
 void prefs_other_init(void)
 {
        OtherPage *page;
-       static gchar *path[2];
+       static gchar *path[3];
 
        path[0] = _("Other");
-       path[1] = NULL;
+       path[1] = _("Miscellaneous");
+       path[2] = NULL;
 
        page = g_new0(OtherPage, 1);
        page->page.path = path;
@@ -299,6 +829,14 @@ void prefs_other_init(void)
                        "gtk-can-change-accels",
                        (glong)prefs_common.gtk_can_change_accels,
                        "XProperty");
+       gtk_settings_set_long_property(gtk_settings_get_default(),
+                       "gtk-enable-accels",
+                       (glong)prefs_common.gtk_enable_accels,
+                       "XProperty");
+       gtk_settings_set_long_property(gtk_settings_get_default(),
+                       "gtk-enable-mnemonics",
+                       (glong)prefs_common.gtk_enable_accels,
+                       "XProperty");
 }
 
 void prefs_other_done(void)
@@ -306,3 +844,20 @@ void prefs_other_done(void)
        prefs_gtk_unregister_page((PrefsPage *) prefs_other);
        g_free(prefs_other);
 }
+
+#ifndef PASSWORD_CRYPTO_OLD
+void prefs_change_master_passphrase(GtkButton *button, gpointer data)
+{
+       /* Call the passphrase change dialog */
+       master_passphrase_change_dialog();
+}
+
+void prefs_use_passphrase_toggled(GtkToggleButton *chkbtn, gpointer data)
+{
+       GtkWidget *button = GTK_WIDGET(data);
+       gboolean active = gtk_toggle_button_get_active(chkbtn);
+
+       if (!active)
+               gtk_widget_set_sensitive(button, active);
+}
+#endif