From 48383f4b8ff8d8471c691b39f5c491a3322c48e0 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 20 Dec 2006 17:23:45 +0000 Subject: [PATCH] 2006-12-20 [colin] 2.6.1cvs59 * src/gtk/quicksearch.c Make sure in_typing is false when clearing --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/quicksearch.c | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ef4e9e265..d5d98b654 100644 --- 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 b0f3b2753..a44a49d04 100644 --- 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 fdb9214b2..0808e644d 100644 --- 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 d2a294dcd..f3aa7520d 100644 --- 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), -- 2.25.1