From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 19 Nov 2004 08:16:33 +0000 (+0000)
Subject: 2004-11-19 [paul]	0.9.12cvs159
X-Git-Tag: rel_0_9_13~32
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=7dfc509d9fd0dd7917972f58b3ba74fb94ab9eab

2004-11-19 [paul]	0.9.12cvs159

	* src/prefs_common.c
		update prefs_keybind_apply_clicked()
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 5b470dc90..78353fa8c 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-11-19 [paul]	0.9.12cvs159
+
+	* src/prefs_common.c
+		update prefs_keybind_apply_clicked()
+
 2004-11-18 [paul]	0.9.12cvs158
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index b683e9844..c13e4f7d4 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -141,3 +141,4 @@
 ( cvs diff -u -r 1.120 -r 1.121 src/prefs_account.c; cvs diff -u -r 1.55 -r 1.56 src/prefs_account.h; cvs diff -u -r 1.174 -r 1.175 src/procmsg.c; ) > 0.9.12cvs156.patchset
 ( cvs diff -u -r 1.313 -r 1.314 src/mainwindow.c; cvs diff -u -r 1.230 -r 1.231 src/prefs_common.c; ) > 0.9.12cvs157.patchset
 ( cvs diff -u -r 1.456 -r 1.457 src/compose.c; cvs diff -u -r 1.126 -r 1.127 src/messageview.c; cvs diff -u -r 1.58 -r 1.59 src/common/utils.c; cvs diff -u -r 1.34 -r 1.35 src/common/utils.h; ) > 0.9.12cvs158.patchset
+( cvs diff -u -r 1.231 -r 1.232 src/prefs_common.c; ) > 0.9.12cvs159.patchset
diff --git a/configure.ac b/configure.ac
index 7e17942e8..b4a31796b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=158
+EXTRA_VERSION=159
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/prefs_common.c b/src/prefs_common.c
index cb2c230a6..7cfa44a8b 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -2553,7 +2553,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 	gchar *rc_str;
 
 	static gchar *default_menurc =
-		"(menu-path \"<Main>/File/Empty trash\" \"\")\n"
+		"(menu-path \"<Main>/File/Empty all Trash folders\" \"\")\n"
 		"(menu-path \"<Main>/File/Save as...\" \"<control>S\")\n"
 		"(menu-path \"<Main>/File/Print...\" \"\")\n"
 		"(menu-path \"<Main>/File/Exit\" \"<control>Q\")\n"
@@ -2563,8 +2563,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
 		"(menu-path \"<Main>/Edit/Search folder...\" \"<shift><control>F\")\n"
 
-		"(menu-path \"<Main>/View/Expand Summary View\" \"V\")\n"
-		"(menu-path \"<Main>/View/Expand Message View\" \"<shift>V\")\n"
+		"(menu-path \"<Main>/View/Show or hide/Message view\" \"V\")\n"
 		"(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
 		"(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
 		"(menu-path \"<Main>/View/Go to/Next message\" \"N\")\n"
@@ -2572,11 +2571,11 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/View/Go to/Next unread message\" \"<shift>N\")\n"
 		"(menu-path \"<Main>/View/Go to/Other folder...\" \"G\")\n"
 		"(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
-		"(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
+		"(menu-path \"<Main>/View/Message source\" \"<control>U\")\n"
 		"(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
-		"(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
+		"(menu-path \"<Main>/View/Update summary\" \"<control><alt>U\")\n"
 
-		"(menu-path \"<Main>/Message/Receive/Get new mail\" \"<control>I\")\n"
+		"(menu-path \"<Main>/Message/Receive/Get from current account\" \"<control>I\")\n"
 		"(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><control>I\")\n"
 		"(menu-path \"<Main>/Message/Compose an email message\" \"<control>M\")\n"
 		"(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
@@ -2597,7 +2596,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
 		"(menu-path \"<Main>/Tools/Log window\" \"<shift><control>L\")\n"
 
-		"(menu-path \"<Compose>/File/Close\" \"<control>W\")\n"
+		"(menu-path \"<Compose>/Message/Close\" \"<control>W\")\n"
 		"(menu-path \"<Compose>/Edit/Select all\" \"<control>A\")\n"
 		"(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"\")\n"
 		"(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"\")\n"
@@ -2606,7 +2605,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"\")";
 
 	static gchar *mew_wl_menurc =
-		"(menu-path \"<Main>/File/Empty trash\" \"<shift>D\")\n"
+		"(menu-path \"<Main>/File/Empty all Trash folders\" \"<shift>D\")\n"
 		"(menu-path \"<Main>/File/Save as...\" \"Y\")\n"
 		"(menu-path \"<Main>/File/Print...\" \"<shift>numbersign\")\n"
 		"(menu-path \"<Main>/File/Exit\" \"<shift>Q\")\n"
@@ -2616,8 +2615,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
 		"(menu-path \"<Main>/Edit/Search folder...\" \"<control>S\")\n"
 
-		"(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
-		"(menu-path \"<Main>/View/Expand Message View\" \"\")\n"
+		"(menu-path \"<Main>/View/Show or hide/Message view\" \"\")\n"
 		"(menu-path \"<Main>/View/Thread view\" \"<shift>T\")\n"
 		"(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
 		"(menu-path \"<Main>/View/Go to/Next message\" \"N\")\n"
@@ -2625,11 +2623,11 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/View/Go to/Next unread message\" \"<shift>N\")\n"
 		"(menu-path \"<Main>/View/Go to/Other folder...\" \"G\")\n"
 		"(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
-		"(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
+		"(menu-path \"<Main>/View/Message source\" \"<control>U\")\n"
 		"(menu-path \"<Main>/View/Show all headers\" \"<shift>H\")\n"
-		"(menu-path \"<Main>/View/Update\" \"<shift>S\")\n"
+		"(menu-path \"<Main>/View/Update summary\" \"<shift>S\")\n"
 
-		"(menu-path \"<Main>/Message/Receive/Get new mail\" \"<control>I\")\n"
+		"(menu-path \"<Main>/Message/Receive/Get from current account\" \"<control>I\")\n"
 		"(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><control>I\")\n"
 		"(menu-path \"<Main>/Message/Compose an email message\" \"W\")\n"
 		"(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
@@ -2650,7 +2648,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
 		"(menu-path \"<Main>/Tools/Log window\" \"<shift><control>L\")\n"
 
-		"(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
+		"(menu-path \"<Compose>/Message/Close\" \"<alt>W\")\n"
 		"(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
 		"(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
 		"(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
@@ -2659,7 +2657,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
 
 	static gchar *mutt_menurc =
-		"(menu-path \"<Main>/File/Empty trash\" \"\")\n"
+		"(menu-path \"<Main>/File/Empty all Trash folders\" \"\")\n"
 		"(menu-path \"<Main>/File/Save as...\" \"S\")\n"
 		"(menu-path \"<Main>/File/Print...\" \"P\")\n"
 		"(menu-path \"<Main>/File/Exit\" \"Q\")\n"
@@ -2669,7 +2667,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
 		"(menu-path \"<Main>/Edit/Search messages...\" \"slash\")\n"
 
-		"(menu-path \"<Main>/View/Toggle summary view\" \"V\")\n"
+		"(menu-path \"<Main>/View/Show or hide/Message view\" \"V\")\n"
 		"(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
 		"(menu-path \"<Main>/View/Go to/Prev message\" \"\")\n"
 		"(menu-path \"<Main>/View/Go to/Next message\" \"\")\n"
@@ -2677,11 +2675,11 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/View/Go to/Next unread message\" \"\")\n"
 		"(menu-path \"<Main>/View/Go to/Other folder...\" \"C\")\n"
 		"(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
-		"(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
+		"(menu-path \"<Main>/View/Message source\" \"<control>U\")\n"
 		"(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
-		"(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
+		"(menu-path \"<Main>/View/Update summary\" \"<control><alt>U\")\n"
 
-		"(menu-path \"<Main>/Message/Receive/Get new mail\" \"<control>I\")\n"
+		"(menu-path \"<Main>/Message/Receive/Get from current account\" \"<control>I\")\n"
 		"(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><control>I\")\n"
 		"(menu-path \"<Main>/Message/Compose an email message\" \"M\")\n"
 		"(menu-path \"<Main>/Message/Reply\" \"R\")\n"
@@ -2702,7 +2700,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/Tools/Execute\" \"X\")\n"
 		"(menu-path \"<Main>/Tools/Log window\" \"<shift><control>L\")\n"
 
-		"(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
+		"(menu-path \"<Compose>/Message/Close\" \"<alt>W\")\n"
 		"(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
 		"(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
 		"(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"
@@ -2711,7 +2709,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Compose>/Edit/Advanced/Delete a word forward\" \"<alt>D\")";
 
 	static gchar *old_sylpheed_menurc =
-		"(menu-path \"<Main>/File/Empty trash\" \"\")\n"
+		"(menu-path \"<Main>/File/Empty all Trash folders\" \"\")\n"
 		"(menu-path \"<Main>/File/Save as...\" \"\")\n"
 		"(menu-path \"<Main>/File/Print...\" \"<alt>P\")\n"
 		"(menu-path \"<Main>/File/Exit\" \"<alt>Q\")\n"
@@ -2721,8 +2719,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
 		"(menu-path \"<Main>/Edit/Search folder...\" \"<control>S\")\n"
 
-		"(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
-		"(menu-path \"<Main>/View/Expand Message View\" \"\")\n"
+		"(menu-path \"<Main>/View/Show or hide/Message view\" \"\")\n"
 		"(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
 		"(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
 		"(menu-path \"<Main>/View/Go to/Next message\" \"N\")\n"
@@ -2730,11 +2727,11 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/View/Go to/Next unread message\" \"<shift>N\")\n"
 		"(menu-path \"<Main>/View/Go to/Other folder...\" \"<alt>G\")\n"
 		"(menu-path \"<Main>/View/Open in new window\" \"<shift><control>N\")\n"
-		"(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
+		"(menu-path \"<Main>/View/Message source\" \"<control>U\")\n"
 		"(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
-		"(menu-path \"<Main>/View/Update\" \"<alt>U\")\n"
+		"(menu-path \"<Main>/View/Update summary\" \"<alt>U\")\n"
 
-		"(menu-path \"<Main>/Message/Receive/Get new mail\" \"<alt>I\")\n"
+		"(menu-path \"<Main>/Message/Receive/Get from current account\" \"<alt>I\")\n"
 		"(menu-path \"<Main>/Message/Receive/Get from all accounts\" \"<shift><alt>I\")\n"
 		"(menu-path \"<Main>/Message/Compose an email message\" \"<alt>N\")\n"
 		"(menu-path \"<Main>/Message/Reply\" \"<alt>R\")\n"
@@ -2755,7 +2752,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 		"(menu-path \"<Main>/Tools/Execute\" \"<alt>X\")\n"
 		"(menu-path \"<Main>/Tools/Log window\" \"<alt>L\")\n"
 
-		"(menu-path \"<Compose>/File/Close\" \"<alt>W\")\n"
+		"(menu-path \"<Compose>/Message/Close\" \"<alt>W\")\n"
 		"(menu-path \"<Compose>/Edit/Select all\" \"\")\n"
 		"(menu-path \"<Compose>/Edit/Advanced/Move a word backward\" \"<alt>B\")\n"
 		"(menu-path \"<Compose>/Edit/Advanced/Move a word forward\" \"<alt>F\")\n"