2006-12-20 [colin] 2.6.1cvs59

	* src/gtk/quicksearch.c
		Make sure in_typing is false when clearing

diff --git a/ChangeLog b/ChangeLog
index ef4e9e2657d22d487e8e813b810b509bdf01eeda..d5d98b65445680176bc28f8f95299f2fa1ff5801 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-20 [colin]     2.6.1cvs59
+
+       * src/gtk/quicksearch.c
+               Make sure in_typing is false when clearing
+
 2006-12-20 [wwp]       2.6.1cvs58
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index b0f3b27538a299f51e7e0936eb9a1fa1f40bd0bb..a44a49d04212d40db9bec415fe991eb76726f40d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2166,3 +2166,4 @@
 ( cvs diff -u -r 1.654.2.2217 -r 1.654.2.2218 configure.ac;  cvs diff -u -r 1.115.2.120 -r 1.115.2.121 src/main.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/bogofilter/bogofilter.c;  ) > 2.6.1cvs56.patchset
 ( cvs diff -u -r 1.204.2.112 -r 1.204.2.113 src/prefs_common.c;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/prefs_summaries.c;  ) > 2.6.1cvs57.patchset
 ( cvs diff -u -r 1.654.2.2219 -r 1.654.2.2220 configure.ac;  ) > 2.6.1cvs58.patchset
+( cvs diff -u -r 1.1.2.56 -r 1.1.2.57 src/gtk/quicksearch.c;  ) > 2.6.1cvs59.patchset

diff --git a/configure.ac b/configure.ac
index fdb9214b2304cc30751ab120be8a490e4ca111a2..0808e644dddbbc25dbe4a0fbd98aebcb26f8e14c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=58
+EXTRA_VERSION=59
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index d2a294dcd960e2b39f353162a23dd4a73a568624..f3aa7520d572a57ef89026071a532440fb2e386c 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -647,6 +647,9 @@ void quicksearch_set(QuickSearch *quicksearch, QuickSearchType type,
        gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt),
                                    type);
 
+       if (!matchstring || !(*matchstring))
+               quicksearch->in_typing = FALSE;
+
        g_signal_handlers_block_by_func(G_OBJECT(GTK_COMBO(quicksearch->search_string_entry)->entry),
                        G_CALLBACK(searchbar_changed_cb), quicksearch);
        gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry),