2010-11-24 [mones] 3.7.7cvs5

	* src/mainwindow.c
		Add missing shortcuts for marking as spam and ham
		Fixes Debian bug #599547

diff --git a/ChangeLog b/ChangeLog
index 07c96a018c42d60d13a54a75dd57bfe55951dbd0..97c6f7b8a5695fb4ec3e0b01f1cc19809ee51ddb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-24 [mones]     3.7.7cvs5
+
+       * src/mainwindow.c
+               Add missing shortcuts for marking as spam and ham
+               Fixes Debian bug #599547
+
 2010-11-22 [colin]     3.7.7cvs4
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 9a2ecc5454b6a8428bd0941734ea5147492127d0..bc5b15bb047a0d8a0d64af159b97c393f720c0a9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4066,3 +4066,4 @@
 ( cvs diff -u -r 1.115.2.231 -r 1.115.2.232 src/main.c;  ) > 3.7.7cvs2.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/claws.def;  ) > 3.7.7cvs3.patchset
 ( cvs diff -u -r 1.382.2.560 -r 1.382.2.561 src/compose.c;  ) > 3.7.7cvs4.patchset
+( cvs diff -u -r 1.274.2.318 -r 1.274.2.319 src/mainwindow.c;  ) > 3.7.7cvs5.patchset

diff --git a/configure.ac b/configure.ac
index 7041d5804513f774ee2e4b881822b508c8f9dc33..c5af6784429ffb0a064589212d90df09b53c6db6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index a7b0381fb46f24f66e437a7c5a86d552e220b08e..95efa5213c1ab20ecde2aeb3b25c76b7ac2e4e0e 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -643,8 +643,8 @@ static GtkActionEntry mainwin_entries[] =
        {"Message/Mark/UnwatchThread",          NULL, N_("Unwatch thread"), NULL, NULL, G_CALLBACK(unwatch_thread_cb) },
        /* separation */
 
-       {"Message/Mark/MarkSpam",               NULL, N_("Mark as spam"), NULL, NULL, G_CALLBACK(mark_as_spam_cb) },
-       {"Message/Mark/MarkHam",                NULL, N_("Mark as ham"), NULL, NULL, G_CALLBACK(mark_as_ham_cb) },
+       {"Message/Mark/MarkSpam",               NULL, N_("Mark as _spam"), NULL, NULL, G_CALLBACK(mark_as_spam_cb) },
+       {"Message/Mark/MarkHam",                NULL, N_("Mark as _ham"), NULL, NULL, G_CALLBACK(mark_as_ham_cb) },
        /* separation */
 
        {"Message/Mark/Lock",                   NULL, N_("Lock"), NULL, NULL, G_CALLBACK(lock_msgs_cb) },