2006-12-20 [colin] 2.6.1cvs59
authorColin Leroy <colin@colino.net>
Wed, 20 Dec 2006 17:23:45 +0000 (17:23 +0000)
committerColin Leroy <colin@colino.net>
Wed, 20 Dec 2006 17:23:45 +0000 (17:23 +0000)
* src/gtk/quicksearch.c
Make sure in_typing is false when clearing

ChangeLog
PATCHSETS
configure.ac
src/gtk/quicksearch.c

index ef4e9e2..d5d98b6 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
index b0f3b27..a44a49d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index fdb9214..0808e64 100644 (file)
@@ -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=
 
index d2a294d..f3aa752 100644 (file)
@@ -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),