commit 9c119dd9d566c890228aa067f4183ba9c96651b8
parent 48d19e2110d91088a652efb6577331c267e98b6d
Author: Ricardo Mones <mones@claws-mail.org>
Date: Wed, 12 Sep 2012 13:14:27 +0000
2012-09-12 [mones] 3.8.1cvs54
* src/prefs_other.c
Fix 1975 'preference mutt key bindings do not take effect'
(and the other invalid paths too)
Diffstat:
4 files changed, 68 insertions(+), 60 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-12 [mones] 3.8.1cvs54
+
+ * src/prefs_other.c
+ Fix 1975 'preference mutt key bindings do not take effect'
+ (and the other invalid paths too)
+
2012-09-12 [colin] 3.8.1cvs53
* src/procmsg.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4428,3 +4428,4 @@
( cvs diff -u -r 1.382.2.610 -r 1.382.2.611 src/compose.c; cvs diff -u -r 1.79.2.75 -r 1.79.2.76 src/mh.c; cvs diff -u -r 1.9.2.55 -r 1.9.2.56 src/common/ssl.c; cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/plugins/pgpcore/passphrase.c; ) > 3.8.1cvs51.patchset
( cvs diff -u -r 1.60.2.149 -r 1.60.2.150 src/addressbook.c; cvs diff -u -r 1.6.10.27 -r 1.6.10.28 src/addrharvest.c; cvs diff -u -r 1.28.2.49 -r 1.28.2.50 src/addrindex.c; cvs diff -u -r 1.13.2.22 -r 1.13.2.23 src/addritem.c; cvs diff -u -r 1.382.2.611 -r 1.382.2.612 src/compose.c; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/edittags.c; cvs diff -u -r 1.213.2.210 -r 1.213.2.211 src/folder.c; cvs diff -u -r 1.179.2.259 -r 1.179.2.260 src/imap.c; cvs diff -u -r 1.149.2.109 -r 1.149.2.110 src/inc.c; cvs diff -u -r 1.12.2.25 -r 1.12.2.26 src/ldif.c; cvs diff -u -r 1.274.2.350 -r 1.274.2.351 src/mainwindow.c; cvs diff -u -r 1.28.2.52 -r 1.28.2.53 src/mbox.c; cvs diff -u -r 1.83.2.194 -r 1.83.2.195 src/mimeview.c; cvs diff -u -r 1.6.10.21 -r 1.6.10.22 src/mutt.c; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/partial_download.c; cvs diff -u -r 1.1.4.78 -r 1.1.4.79 src/prefs_filtering_action.c; cvs diff -u -r 1.30.2.73 -r 1.30.2.74 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/printing.c; cvs diff -u -r 1.47.2.58 -r 1.47.2.59 src/procheader.c; cvs diff -u -r 1.49.2.149 -r 1.49.2.150 src/procmime.c; cvs diff -u -r 1.150.2.126 -r 1.150.2.127 src/procmsg.c; cvs diff -u -r 1.395.2.452 -r 1.395.2.453 src/summaryview.c; cvs diff -u -r 1.96.2.247 -r 1.96.2.248 src/textview.c; cvs diff -u -r 1.36.2.200 -r 1.36.2.201 src/common/utils.c; cvs diff -u -r 1.1.4.119 -r 1.1.4.120 src/etpan/imap-thread.c; cvs diff -u -r 1.9.2.80 -r 1.9.2.81 src/gtk/gtkaspell.c; cvs diff -u -r 1.1.2.73 -r 1.1.2.74 src/plugins/pgpcore/sgpgme.c; ) > 3.8.1cvs52.patchset
( cvs diff -u -r 1.150.2.127 -r 1.150.2.128 src/procmsg.c; ) > 3.8.1cvs53.patchset
+( cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/prefs_other.c; ) > 3.8.1cvs54.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/prefs_other.c b/src/prefs_other.c
@@ -194,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);
}
@@ -222,11 +226,11 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
{"<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/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"},
@@ -302,11 +306,11 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
{"<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/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"},
@@ -346,56 +350,53 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
static struct KeyBind mutt_menurc[] = {
/* main */
- {"<Actions>/Menu/File/EmptyTrashes", ""},
- {"<Actions>/Menu/File/SaveAs", "S"},
- {"<Actions>/Menu/File/Print", "P"},
- {"<Actions>/Menu/File/Exit", "Q"},
-
- {"<Actions>/Menu/Edit/Copy", "<control>C"},
- {"<Actions>/Menu/Edit/SelectAll", "<control>A"},
- {"<Actions>/Menu/Edit/Find", "<control>F"},
- {"<Actions>/Menu/Edit/SearchFolder", "/"},
-
- {"<Actions>/Menu/View/ShowHide/MessageView", "V"},
- {"<Actions>/Menu/View/ThreadView", "<control>T"},
- {"<Actions>/Menu/View/GoTo/Prev", ""},
- {"<Actions>/Menu/View/GoTo/Next", ""},
- {"<Actions>/Menu/View/GoTo/PrevUnread", ""},
- {"<Actions>/Menu/View/GoTo/NextUnread", ""},
- {"<Actions>/Menu/View/GoTo/OtherFolder", "C"},
- {"<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", "M"},
- {"<Actions>/Menu/Message/Reply", "R"},
- {"<Actions>/Menu/Message/ReplyTo/All", "G"},
- {"<Actions>/Menu/Message/ReplyTo/Sender", ""},
- {"<Actions>/Menu/Message/ReplyTo/List", "<control>L"},
- {"<Actions>/Menu/Message/Forward", "F"},
- {"<Actions>/Menu/Message/Move", "<control>O"},
- {"<Actions>/Menu/Message/Copy", "<shift>C"},
- {"<Actions>/Menu/Message/Trash", "D"},
- {"<Actions>/Menu/Message/Mark/Mark", "<shift>F"},
- {"<Actions>/Menu/Message/Mark/Unmark", "U"},
- {"<Actions>/Menu/Message/Mark/MarkUnread", "<shift>N"},
- {"<Actions>/Menu/Message/Mark/MarkRead", ""},
-
- {"<Actions>/Menu/Tools/AddressBook", "<shift><control>A"},
- {"<Actions>/Menu/Tools/Execute", "X"},
- {"<Actions>/Menu/Tools/NetworkLog", "<shift><control>L"},
+ {"<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/SelectAll", ""},
- {"<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"},
+ {"<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_get_active_text(GTK_COMBO_BOX(keybind.combo));
