evolution r37253 - in trunk: addressbook addressbook/gui/widgets widgets/misc

[mcrha svn gnome org]

Author: mcrha
Date: Thu Feb 12 11:09:31 2009
New Revision: 37253
URL: http://svn.gnome.org/viewvc/evolution?rev=37253&view=rev

Log:
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.



Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/widgets/e-addressbook-view.c
   trunk/widgets/misc/ChangeLog
   trunk/widgets/misc/e-filter-bar.c

Modified: trunk/addressbook/gui/widgets/e-addressbook-view.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-addressbook-view.c	(original)
+++ trunk/addressbook/gui/widgets/e-addressbook-view.c	Thu Feb 12 11:09:31 2009
@@ -1369,7 +1369,8 @@
 		     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))) {

Modified: trunk/widgets/misc/e-filter-bar.c
==============================================================================
--- trunk/widgets/misc/e-filter-bar.c	(original)
+++ trunk/widgets/misc/e-filter-bar.c	Thu Feb 12 11:09:31 2009
@@ -117,7 +117,6 @@
 
 			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 @@
 			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);