2012-09-19 [colin] 3.8.1cvs64
[claws.git] / src / prefs_other.c
index 242d6c46b8ac45bc4fdf618567cebea076dec9e9..53d35665ac38ead1e5c086bc219eb2326c38b4b2 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
+ * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & 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 "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -36,6 +37,7 @@
 
 #include "gtk/gtkutils.h"
 #include "gtk/prefswindow.h"
+#include "combobox.h"
 
 #include "manage_window.h"
 #ifdef HAVE_LIBETPAN
@@ -53,11 +55,13 @@ typedef struct _OtherPage
        GtkWidget *checkbtn_cleanonexit;
        GtkWidget *checkbtn_askonclean;
        GtkWidget *checkbtn_warnqueued;
-        GtkWidget *checkbtn_cliplog;
-       GtkWidget *spinbtn_loglength;
        GtkWidget *spinbtn_iotimeout;
        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;
 } OtherPage;
 
 static struct KeybindDialog {
@@ -89,7 +93,8 @@ static void prefs_keybind_select(void)
 
        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), _("Select key bindings"));
+       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);
@@ -107,15 +112,12 @@ static void prefs_keybind_select(void)
        gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-       combo = gtk_combo_new ();
-       gtk_box_pack_start (GTK_BOX (hbox1), combo, TRUE, TRUE, 0);
-       gtkut_combo_set_items (GTK_COMBO (combo),
+       combo = combobox_text_new(FALSE,
                               _("Default"),
                               "Mew / Wanderlust",
                               "Mutt",
-                              _("Old Sylpheed"),
                               NULL);
-       gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO (combo)->entry), FALSE);
+       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);
@@ -158,7 +160,7 @@ static void prefs_keybind_select(void)
 static gboolean prefs_keybind_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                          gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                prefs_keybind_cancel();
        return FALSE;
 }
@@ -192,6 +194,10 @@ static void prefs_keybind_apply(struct KeyBind keybind[], gint num)
                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);
        }
@@ -199,258 +205,202 @@ static void prefs_keybind_apply(struct KeyBind keybind[], gint num)
 
 static void prefs_keybind_apply_clicked(GtkWidget *widget)
 {
-       GtkEntry *entry = GTK_ENTRY(GTK_COMBO(keybind.combo)->entry);
-       const gchar *text;
+       gchar *text;
        struct KeyBind *menurc;
        gint n_menurc;
 
        static struct KeyBind default_menurc[] = {
-               {"<Main>/File/Empty all Trash folders",         "<shift>D"},
-               {"<Main>/File/Save as...",                      "<control>S"},
-               {"<Main>/File/Print...",                        "<control>P"},
-               {"<Main>/File/Work offline",                    "<control>W"},
-               {"<Main>/File/Synchronise folders",             "<control><shift>S"},
-               {"<Main>/File/Exit",                            "<control>Q"},
-
-               {"<Main>/Edit/Copy",                            "<control>C"},
-               {"<Main>/Edit/Select all",                      "<control>A"},
-               {"<Main>/Edit/Find in current message...",      "<control>F"},
-               {"<Main>/Edit/Search folder...",                "<shift><control>F"},
-               {"<Main>/Edit/Quick search",                    "slash"},
-
-               {"<Main>/View/Show or hide/Message View",       "V"},
-               {"<Main>/View/Thread view",                     "<control>T"},
-               {"<Main>/View/Go to/Previous message",          "P"},
-               {"<Main>/View/Go to/Next message",              "N"},
-               {"<Main>/View/Go to/Previous unread message",   "<shift>P"},
-               {"<Main>/View/Go to/Next unread message",       "<shift>N"},
-               {"<Main>/View/Go to/Other folder...",           "G"},
-               {"<Main>/View/Open in new window",              "<control><alt>N"},
-               {"<Main>/View/Message source",                  "<control>U"},
-               {"<Main>/View/All headers",                     "<control>H"},
-               {"<Main>/View/Update summary",                  "<control><alt>U"},
-
-               {"<Main>/Message/Receive/Get from current account",
-                                                               "<control>I"},
-               {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
-               {"<Main>/Message/Compose an email message",     "<control>M"},
-               {"<Main>/Message/Reply",                        "<control>R"},
-               {"<Main>/Message/Reply to/all",                 "<shift><control>R"},
-               {"<Main>/Message/Reply to/sender",              ""},
-               {"<Main>/Message/Reply to/mailing list",        "<control>L"},
-               {"<Main>/Message/Forward",                      "<control><alt>F"},
-               /* {"<Main>/Message/Forward as attachment",      ""}, */
-               {"<Main>/Message/Move...",                      "<control>O"},
-               {"<Main>/Message/Copy...",                      "<shift><control>O"},
-               {"<Main>/Message/Move to trash",                "<control>D"},
-               {"<Main>/Message/Mark/Mark",                    "<shift>asterisk"},
-               {"<Main>/Message/Mark/Unmark",                  "U"},
-               {"<Main>/Message/Mark/Mark as unread",          "<shift>exclam"},
-               {"<Main>/Message/Mark/Mark as read",            ""},
-
-               {"<Main>/Tools/Address book",                   "<shift><control>A"},
-               {"<Main>/Tools/Execute",                        "X"},
-               {"<Main>/Tools/Log window",                     "<shift><control>L"},
-
-               {"<Compose>/Message/Send",                              "<control>Return"},
-               {"<Compose>/Message/Send later",                        "<shift><control>S"},
-               {"<Compose>/Message/Attach file",                       "<control>M"},
-               {"<Compose>/Message/Insert file",                       "<control>I"},
-               {"<Compose>/Message/Insert signature",                  "<control>G"},
-               {"<Compose>/Message/Save",                              "<control>S"},
-               {"<Compose>/Message/Close",                             "<control>W"},
-               {"<Compose>/Edit/Undo",                                 "<control>Z"},
-               {"<Compose>/Edit/Redo",                                 "<control>Y"},
-               {"<Compose>/Edit/Cut",                                  "<control>X"},
-               {"<Compose>/Edit/Copy",                                 "<control>C"},
-               {"<Compose>/Edit/Paste",                                "<control>V"},
-               {"<Compose>/Edit/Select all",                           "<control>A"},
-               {"<Compose>/Edit/Advanced/Move a character backward",   "<control>B"},
-               {"<Compose>/Edit/Advanced/Move a character forward",    "<control>F"},
-               {"<Compose>/Edit/Advanced/Move a word backward,"        ""},
-               {"<Compose>/Edit/Advanced/Move a word forward",         ""},
-               {"<Compose>/Edit/Advanced/Move to beginning of line",   ""},
-               {"<Compose>/Edit/Advanced/Move to end of line",         "<control>E"},
-               {"<Compose>/Edit/Advanced/Move to previous line",       "<control>P"},
-               {"<Compose>/Edit/Advanced/Move to next line",           "<control>N"},
-               {"<Compose>/Edit/Advanced/Delete a character backward", "<control>H"},
-               {"<Compose>/Edit/Advanced/Delete a character forward",  "<control>D"},
-               {"<Compose>/Edit/Advanced/Delete a word backward",      ""},
-               {"<Compose>/Edit/Advanced/Delete a word forward",       ""},
-               {"<Compose>/Edit/Advanced/Delete line",                 "<control>U"},
-               {"<Compose>/Edit/Advanced/Delete entire line",          ""},
-               {"<Compose>/Edit/Advanced/Delete to end of line",       "<control>K"},
-               {"<Compose>/Edit/Wrap current paragraph",               "<control>L"},
-               {"<Compose>/Edit/Wrap all long lines",                  "<control><alt>L"},
-               {"<Compose>/Edit/Auto wrapping",                        "<shift><control>L"},
-               {"<Compose>/Edit/Edit with external editor",            "<shift><control>X"},
-               {"<Compose>/Tools/Address book",                        "<shift><control>A"},
+               /* 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/OtherFolder",                "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>/File/Empty all Trash folders",         "<shift>D"},
-               {"<Main>/File/Save as...",                      "Y"},
-               {"<Main>/File/Print...",                        "<shift>numbersign"},
-               {"<Main>/File/Exit",                            "<shift>Q"},
-
-               {"<Main>/Edit/Copy",                            "<control>C"},
-               {"<Main>/Edit/Select all",                      "<control>A"},
-               {"<Main>/Edit/Find in current message...",      "<control>F"},
-               {"<Main>/Edit/Search folder...",                "<control>S"},
-
-               {"<Main>/View/Show or hide/Message View",       ""},
-               {"<Main>/View/Thread view",                     "<shift>T"},
-               {"<Main>/View/Go to/Previous message",          "P"},
-               {"<Main>/View/Go to/Next message",              "N"},
-               {"<Main>/View/Go to/Previous unread message",   "<shift>P"},
-               {"<Main>/View/Go to/Next unread message",       "<shift>N"},
-               {"<Main>/View/Go to/Other folder...",           "G"},
-               {"<Main>/View/Open in new window",              "<control><alt>N"},
-               {"<Main>/View/Message source",                  "<control>U"},
-               {"<Main>/View/All headers",                     "<shift>H"},
-               {"<Main>/View/Update summary",                  "<shift>S"},
-
-               {"<Main>/Message/Receive/Get from current account",
-                                                               "<control>I"},
-               {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
-               {"<Main>/Message/Compose an email message",     "W"},
-               {"<Main>/Message/Reply",                        "<control>R"},
-               {"<Main>/Message/Reply to/all",                 "<shift>A"},
-               {"<Main>/Message/Reply to/sender",              ""},
-               {"<Main>/Message/Reply to/mailing list",        "<control>L"},
-               {"<Main>/Message/Forward",                      "F"},
-               /* {"<Main>/Message/Forward as attachment", "<shift>F"}, */
-               {"<Main>/Message/Move...",                      "O"},
-               {"<Main>/Message/Copy...",                      "<shift>O"},
-               {"<Main>/Message/Delete",                       "D"},
-               {"<Main>/Message/Mark/Mark",                    "<shift>asterisk"},
-               {"<Main>/Message/Mark/Unmark",                  "U"},
-               {"<Main>/Message/Mark/Mark as unread",          "<shift>exclam"},
-               {"<Main>/Message/Mark/Mark as read",            "<shift>R"},
-
-               {"<Main>/Tools/Address book",                   "<shift><control>A"},
-               {"<Main>/Tools/Execute",                        "X"},
-               {"<Main>/Tools/Log window",                     "<shift><control>L"},
-
-               {"<Compose>/Message/Close",                             "<alt>W"},
-               {"<Compose>/Edit/Select all",                           ""},
-               {"<Compose>/Edit/Advanced/Move a word backward,"        "<alt>B"},
-               {"<Compose>/Edit/Advanced/Move a word forward",         "<alt>F"},
-               {"<Compose>/Edit/Advanced/Move to beginning of line",   "<control>A"},
-               {"<Compose>/Edit/Advanced/Delete a word backward",      "<control>W"},
-               {"<Compose>/Edit/Advanced/Delete a word forward",       "<alt>D"},
+               /* 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/OtherFolder",                "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>/File/Empty all Trash folders",         ""},
-               {"<Main>/File/Save as...",                      "S"},
-               {"<Main>/File/Print...",                        "P"},
-               {"<Main>/File/Exit",                            "Q"},
-
-               {"<Main>/Edit/Copy",                            "<control>C"},
-               {"<Main>/Edit/Select all",                      "<control>A"},
-               {"<Main>/Edit/Find in current message...",      "<control>F"},
-               {"<Main>/Edit/Search messages...",              "slash"},
-
-               {"<Main>/View/Show or hide/Message view",       "V"},
-               {"<Main>/View/Thread view",                     "<control>T"},
-               {"<Main>/View/Go to/Previous message",          ""},
-               {"<Main>/View/Go to/Next message",              ""},
-               {"<Main>/View/Go to/Previous unread message",   ""},
-               {"<Main>/View/Go to/Next unread message",       ""},
-               {"<Main>/View/Go to/Other folder...",           "C"},
-               {"<Main>/View/Open in new window",              "<control><alt>N"},
-               {"<Main>/View/Message source",                  "<control>U"},
-               {"<Main>/View/All headers",                     "<control>H"},
-               {"<Main>/View/Update summary",                  "<control><alt>U"},
-
-               {"<Main>/Message/Receive/Get from current account",
-                                                               "<control>I"},
-               {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
-               {"<Main>/Message/Compose an email message",             "M"},
-               {"<Main>/Message/Reply",                        "R"},
-               {"<Main>/Message/Reply to/all",                 "G"},
-               {"<Main>/Message/Reply to/sender",              ""},
-               {"<Main>/Message/Reply to/mailing list",        "<control>L"},
-               {"<Main>/Message/Forward",                      "F"},
-               {"<Main>/Message/Forward as attachment",        ""},
-               {"<Main>/Message/Move...",                      "<control>O"},
-               {"<Main>/Message/Copy...",                      "<shift>C"},
-               {"<Main>/Message/Delete",                       "D"},
-               {"<Main>/Message/Mark/Mark",                    "<shift>F"},
-               {"<Main>/Message/Mark/Unmark",                  "U"},
-               {"<Main>/Message/Mark/Mark as unread",          "<shift>N"},
-               {"<Main>/Message/Mark/Mark as read",            ""},
-
-               {"<Main>/Tools/Address book",                   "<shift><control>A"},
-               {"<Main>/Tools/Execute",                        "X"},
-               {"<Main>/Tools/Log window",                     "<shift><control>L"},
-
-               {"<Compose>/Message/Close",                             "<alt>W"},
-               {"<Compose>/Edit/Select all",                           ""},
-               {"<Compose>/Edit/Advanced/Move a word backward",        "<alt>B"},
-               {"<Compose>/Edit/Advanced/Move a word forward",         "<alt>F"},
-               {"<Compose>/Edit/Advanced/Move to beginning of line",   "<control>A"},
-               {"<Compose>/Edit/Advanced/Delete a word backward",      "<control>W"},
-               {"<Compose>/Edit/Advanced/Delete a word forward",       "<alt>D"},
+               /* 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/OtherFolder",                "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"}, /* - */
        };
 
-       static struct KeyBind old_sylpheed_menurc[] = {
-               {"<Main>/File/Empty all Trash folders",         ""},
-               {"<Main>/File/Save as...",                      ""},
-               {"<Main>/File/Print...",                        "<alt>P"},
-               {"<Main>/File/Exit",                            "<alt>Q"},
-
-               {"<Main>/Edit/Copy",                            "<control>C"},
-               {"<Main>/Edit/Select all",                      "<control>A"},
-               {"<Main>/Edit/Find in current message...",      "<control>F"},
-               {"<Main>/Edit/Search folder...",                "<control>S"},
-
-               {"<Main>/View/Show or hide/Message View",       ""},
-               {"<Main>/View/Thread view",                     "<control>T"},
-               {"<Main>/View/Go to/Previous message",          "P"},
-               {"<Main>/View/Go to/Next message",              "N"},
-               {"<Main>/View/Go to/Previous unread message",   "<shift>P"},
-               {"<Main>/View/Go to/Next unread message",       "<shift>N"},
-               {"<Main>/View/Go to/Other folder...",           "<alt>G"},
-               {"<Main>/View/Open in new window",              "<shift><control>N"},
-               {"<Main>/View/Message source",                  "<control>U"},
-               {"<Main>/View/All headers",                     "<control>H"},
-               {"<Main>/View/Update summary",                  "<alt>U"},
-
-               {"<Main>/Message/Receive/Get from current account",
-                                                               "<alt>I"},
-               {"<Main>/Message/Receive/Get from all accounts","<shift><alt>I"},
-               {"<Main>/Message/Compose an email message",     "<alt>N"},
-               {"<Main>/Message/Reply",                        "<alt>R"},
-               {"<Main>/Message/Reply to/all",                 "<shift><alt>R"},
-               {"<Main>/Message/Reply to/sender",              "<control><alt>R"},
-               {"<Main>/Message/Reply to/mailing list",        "<control>L"},
-               {"<Main>/Message/Forward",                       "<shift><alt>F"},
-               /* "(menu-path \"<Main>/Message/Forward as attachment", "<shift><control>F"}, */
-               {"<Main>/Message/Move...",                      "<alt>O"},
-               {"<Main>/Message/Copy...",                      ""},
-               {"<Main>/Message/Delete",                       "<alt>D"},
-               {"<Main>/Message/Mark/Mark",                    "<shift>asterisk"},
-               {"<Main>/Message/Mark/Unmark",                  "U"},
-               {"<Main>/Message/Mark/Mark as unread",          "<shift>exclam"},
-               {"<Main>/Message/Mark/Mark as read",            ""},
-
-               {"<Main>/Tools/Address book",                   "<alt>A"},
-               {"<Main>/Tools/Execute",                        "<alt>X"},
-               {"<Main>/Tools/Log window",                     "<alt>L"},
-
-               {"<Compose>/Message/Close",                             "<alt>W"},
-               {"<Compose>/Edit/Select all",                           ""},
-               {"<Compose>/Edit/Advanced/Move a word backward",        "<alt>B"},
-               {"<Compose>/Edit/Advanced/Move a word forward",         "<alt>F"},
-               {"<Compose>/Edit/Advanced/Move to beginning of line",   "<control>A"},
-               {"<Compose>/Edit/Advanced/Delete a word backward",      "<control>W"},
-               {"<Compose>/Edit/Advanced/Delete a word forward",       "<alt>D"},
-       };
-  
-       text = gtk_entry_get_text(entry);
-  
+       text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(keybind.combo));
+
        if (!strcmp(text, _("Default"))) {
                menurc = default_menurc;
                n_menurc = G_N_ELEMENTS(default_menurc);
@@ -460,14 +410,12 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
        } else if (!strcmp(text, "Mutt")) {
                menurc = mutt_menurc;
                n_menurc = G_N_ELEMENTS(mutt_menurc);
-       } else if (!strcmp(text, _("Old Sylpheed"))) {
-               menurc = old_sylpheed_menurc;
-               n_menurc = G_N_ELEMENTS(old_sylpheed_menurc);
        } else {
+               g_free(text);
                return;
        }
+       g_free(text);
 
-       /* prefs_keybind_apply(empty_menurc, G_N_ELEMENTS(empty_menurc)); */
        prefs_keybind_apply(menurc, n_menurc);
 
        gtk_widget_destroy(keybind.window);
@@ -487,33 +435,34 @@ static 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 *checkbtn_askonfilter;
 
        GtkWidget *frame_keys;
        GtkWidget *vbox_keys;
        GtkWidget *checkbtn_gtk_can_change_accels;
-       GtkTooltips *gtk_can_change_accels_tooltip;
        GtkWidget *button_keybind;
 
        GtkWidget *label_iotimeout;
        GtkWidget *spinbtn_iotimeout;
-       GtkObject *spinbtn_iotimeout_adj;
+       GtkAdjustment *spinbtn_iotimeout_adj;
+
+       GtkWidget *vbox2;
+       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;
+
+       gchar *shred_binary = NULL;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -525,43 +474,6 @@ static 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"));
 
@@ -574,9 +486,6 @@ static 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"));
@@ -584,18 +493,17 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        vbox_keys = gtkut_get_options_frame(vbox1, &frame_keys, _("Keyboard shortcuts"));
 
        PACK_CHECK_BUTTON(vbox_keys, checkbtn_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),
-                       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 menu shortcuts."),
-                       NULL);
+                               "existing keyboard shortcuts."));
 
-       button_keybind = gtk_button_new_with_label (_(" Set key bindings... "));
+       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);
@@ -604,6 +512,28 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        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);
@@ -612,7 +542,7 @@ static 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);
@@ -625,13 +555,32 @@ static 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);
 
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+       vbox2 = gtk_vbox_new (FALSE, 8);
+       gtk_widget_show (vbox2);
+       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON (hbox1, checkbtn_askonfilter,
+       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"));
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_addaddrbyclick), 
                prefs_common.add_address_by_click);
@@ -643,37 +592,37 @@ static 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(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_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);
 
        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->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;
        prefs_other->page.widget = vbox1;
 }
 
 static void prefs_other_save(PrefsPage *_page)
 {
        OtherPage *page = (OtherPage *) _page;
-       MainWindow *mainwindow;
        gboolean gtk_can_change_accels;
 
        prefs_common.add_address_by_click = gtk_toggle_button_get_active(
@@ -686,12 +635,10 @@ static 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);
@@ -699,10 +646,12 @@ static void prefs_other_save(PrefsPage *_page)
        prefs_common.ask_apply_per_account_filtering_rules = 
                gtk_toggle_button_get_active(
                        GTK_TOGGLE_BUTTON(page->checkbtn_askonfilter)); 
-
-       mainwindow = mainwindow_get_mainwindow();
-       log_window_set_clipping(mainwindow->logwin, prefs_common.cliplog,
-                               prefs_common.loglength);
+       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)); 
 
        gtk_can_change_accels = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_gtk_can_change_accels));
@@ -731,10 +680,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;