aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Williams <peterw@ximian.com>2002-08-30 01:24:43 +0800
committerPeter Williams <peterw@src.gnome.org>2002-08-30 01:24:43 +0800
commitbd94562c049c95452540e35e2655770fbbcc128b (patch)
treee957762b6423c2372fd35ef00ae5eca5aae384f0
parent56576aad3fc8f975cb9af70b8381a0947285ec16 (diff)
downloadgsoc2013-evolution-bd94562c049c95452540e35e2655770fbbcc128b.tar
gsoc2013-evolution-bd94562c049c95452540e35e2655770fbbcc128b.tar.gz
gsoc2013-evolution-bd94562c049c95452540e35e2655770fbbcc128b.tar.bz2
gsoc2013-evolution-bd94562c049c95452540e35e2655770fbbcc128b.tar.lz
gsoc2013-evolution-bd94562c049c95452540e35e2655770fbbcc128b.tar.xz
gsoc2013-evolution-bd94562c049c95452540e35e2655770fbbcc128b.tar.zst
gsoc2013-evolution-bd94562c049c95452540e35e2655770fbbcc128b.zip
If the item is ADVANCED_ID, check the query and efb->setquery to see
2002-08-29 Peter Williams <peterw@ximian.com> * 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
-rw-r--r--widgets/misc/ChangeLog6
-rw-r--r--widgets/misc/e-filter-bar.c9
2 files changed, 14 insertions, 1 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 1e8c91fcff..d2bb3a268a 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-29 Peter Williams <peterw@ximian.com>
+
+ * 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.
+
2002-08-21 Peter Williams <peterw@ximian.com>
* e-search-bar.c (clear_search): Don't set the item id; clear search
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) {