2011-08-12 [wwp] 3.7.9cvs44

	* src/gtk/quicksearch.c
	 Fix duplicate key accel (thanks to Ra-Mones-Mones II).

diff --git a/ChangeLog b/ChangeLog
index 904640ba404c10c754ab289cc8b6d94025b040d3..4d94ba5a978a9ccf8d897fe781ceba3a865c210d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-12 [wwp]       3.7.9cvs44
+
+       * src/gtk/quicksearch.c
+        Fix duplicate key accel (thanks to Ra-Mones-Mones II).
+

 2011-08-09 [paul]      3.7.9cvs43
 
        * src/mimeview.c
 2011-08-09 [paul]      3.7.9cvs43
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index 9686e69dbb2c86e1af75efd83fb499123692e7a2..13af21216161372d7016910be148a06600498e8a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4195,3 +4195,4 @@
 ( cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/gtk/description_window.c;  ) > 3.7.9cvs41.patchset
 ( cvs diff -u -r 1.382.2.577 -r 1.382.2.578 src/compose.c;  ) > 3.7.9cvs42.patchset
 ( cvs diff -u -r 1.83.2.168 -r 1.83.2.169 src/mimeview.c;  ) > 3.7.9cvs43.patchset
 ( cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/gtk/description_window.c;  ) > 3.7.9cvs41.patchset
 ( cvs diff -u -r 1.382.2.577 -r 1.382.2.578 src/compose.c;  ) > 3.7.9cvs42.patchset
 ( cvs diff -u -r 1.83.2.168 -r 1.83.2.169 src/mimeview.c;  ) > 3.7.9cvs43.patchset

+( cvs diff -u -r 1.1.2.102 -r 1.1.2.103 src/gtk/quicksearch.c;  ) > 3.7.9cvs44.patchset

diff --git a/configure.ac b/configure.ac
index d584910fc80a53930d7c2ee007df3a9f2186a89e..f5662c5949a1be3724057bf4b9540b87adb536dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=43
+EXTRA_VERSION=44

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 248c4a275b75889596643030cf6ed01f1ab0f492..62dd49304cd575ec4cf690e993ae4c8991b8e9b3 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -861,7 +861,7 @@ QuickSearch *quicksearch_new()
 
        quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, _("_Information"));
        quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("_Edit"));
 
        quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, _("_Information"));
        quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("_Edit"));

-       quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("_Clear"));
+       quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("C_lear"));

        
        update_extended_buttons(quicksearch);
 
        
        update_extended_buttons(quicksearch);
 


@@ -876,7 +876,7 @@ void quicksearch_relayout(QuickSearch *quicksearch)
        case WIDE_MSGLIST_LAYOUT:
                quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, _("_Information"));
                quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("_Edit"));
        case WIDE_MSGLIST_LAYOUT:
                quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, _("_Information"));
                quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("_Edit"));

-               quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("_Clear"));
+               quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("C_lear"));

                break;
        case SMALL_LAYOUT:
        case VERTICAL_LAYOUT:
                break;
        case SMALL_LAYOUT:
        case VERTICAL_LAYOUT: