From bd94562c049c95452540e35e2655770fbbcc128b Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Thu, 29 Aug 2002 17:24:43 +0000 Subject: If the item is ADVANCED_ID, check the query and efb->setquery to see 2002-08-29 Peter Williams * e-filter-bar.c (option_changed): If the item is ADVANCED_ID, check the query and efb->setquery to see whether we should pop up the advanced dialog or clear an advanced search. Fixes #29625. svn path=/trunk/; revision=17923 --- widgets/misc/e-filter-bar.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'widgets/misc/e-filter-bar.c') diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index e2e546fed7..0ad49f325c 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -266,7 +266,14 @@ option_changed (ESearchBar *esb, void *data) switch (id) { case E_FILTERBAR_ADVANCED_ID: - do_advanced (esb); + query = e_search_bar_get_text (esb); + if (query && *query) + do_advanced (esb); + else if (!efb->setquery) + /* clearing advanced search, reset because search may + * have rules not dependent on query text */ + e_search_bar_set_item_id (esb, 0); + g_free (query); break; default: if (id >= efb->option_base && id < efb->option_base + efb->option_rules->len) { -- cgit v1.2.3