diff options
Diffstat (limited to 'widgets/misc')
| -rw-r--r-- | widgets/misc/ChangeLog | 7 | ||||
| -rw-r--r-- | widgets/misc/e-filter-bar.c | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 46d95c292c..4b91f93784 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,10 @@ +2008-04-30 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #528288 + + * e-filter-bar.c: (get_property): Do not return any query + with empty text from search bar. + 2008-04-25 Danny Baumann <dannybaumann@web.de> ** Fix for bug #529893 diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index be77dbdb39..20d85d8f63 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -592,8 +592,11 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp ESearchBar *esb = E_SEARCH_BAR (object); switch (property_id) { - case PROP_QUERY: - if (efb->current_query) { + case PROP_QUERY: { + char *text = e_search_bar_get_text (E_SEARCH_BAR (efb)); + + /* empty search text means searching turned off */ + if (efb->current_query && text && *text) { GString *out = g_string_new (""); filter_rule_build_code (efb->current_query, out); @@ -602,7 +605,9 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp } else { g_value_set_string (value, NULL); } - break; + + g_free (text); + break; } case PROP_STATE: { /* FIXME: we should have ESearchBar save its own state to the xmlDocPtr */ xmlChar *xmlbuf; |