diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-02-12 19:09:31 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2009-02-12 19:09:31 +0800 |
| commit | 547e40879a899197ca6cc97fd3ff61df8e6b2758 (patch) | |
| tree | 15d2775c7dd697238f9249a7cf791a28714bcbc2 | |
| parent | 73ece6ee4b8abc931609f770ccec7d566da7d40c (diff) | |
| download | gsoc2013-evolution-547e40879a899197ca6cc97fd3ff61df8e6b2758.tar.gz gsoc2013-evolution-547e40879a899197ca6cc97fd3ff61df8e6b2758.tar.zst gsoc2013-evolution-547e40879a899197ca6cc97fd3ff61df8e6b2758.zip | |
** Fix for bug #404232
2009-02-12 Milan Crha <mcrha@redhat.com>
** Fix for bug #404232
* addressbook/gui/widgets/e-addressbook-view.c: (search_activated):
Rebuild view immediately for an advanced search too.
* widgets/misc/e-filter-bar.c: (rule_advanced_response): Emit signal after
search bar text is set, thus the text will not be empty, which
is considered as "no search" these days.
svn path=/trunk/; revision=37253
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 3 | ||||
| -rw-r--r-- | widgets/misc/ChangeLog | 8 | ||||
| -rw-r--r-- | widgets/misc/e-filter-bar.c | 3 |
4 files changed, 19 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 456f00cb51..bec876906d 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2009-02-12 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #404232 + + * gui/widgets/e-addressbook-view.c: (search_activated): + Rebuild view immediately for an advanced search too. + 2009-02-11 Andre Klapper <a9016009@gmx.de> * /gui/component/addressbook-migrate.c: diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 3b1fd8191c..c138df8ff2 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1369,7 +1369,8 @@ search_activated (ESearchBar *esb, EABView *v) NULL); if (search_type == E_FILTERBAR_ADVANCED_ID) { - // gtk_widget_show(eab_search_dialog_new(v)); + /* rebuild view immediately */ + query_changed (esb, v); } else { if ((search_word && strlen (search_word))) { diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 2c1046f0a6..d81e52d0a1 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,11 @@ +2009-02-12 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #404232 + + * e-filter-bar.c: (rule_advanced_response): Emit signal after + search bar text is set, thus the text will not be empty, which + is considered as "no search" these days. + 2009-01-30 Suman Manjunath <msuman@novell.com> ** Fix for bug #342446 diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index aee6ecad0b..65b25c3986 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -117,7 +117,6 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) efb->current_query = rule; g_object_ref (rule); - g_signal_emit_by_name (efb, "search_activated"); gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED])); @@ -126,6 +125,8 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) e_search_bar_set_text (esb,_("Advanced Search")); gtk_widget_set_sensitive (esb->clear_button, TRUE); + g_signal_emit_by_name (efb, "search_activated"); + if (response == GTK_RESPONSE_APPLY) { if (!rule_context_find_rule (efb->context, rule->name, rule->source)) rule_context_add_rule (efb->context, rule); |