[evolution] Bug 609302 - Quick search filters are broken

[Matthew Barnes <mbarnes src gnome org>]

commit 9cd1f937a26363aa108f3d2b36606b167597a2eb
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Feb 8 12:02:44 2010 -0500

    Bug 609302 - Quick search filters are broken

 shell/e-shell-searchbar.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 13ff2ad..272ba0e 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -656,9 +656,14 @@ shell_searchbar_constructed (GObject *object)
 		widget, "changed",
 		G_CALLBACK (e_shell_searchbar_set_state_dirty), searchbar);
 
-	g_signal_connect_swapped (
+	/* Use G_CONNECT_AFTER here so the EActionComboBox has a
+	 * chance to update its radio actions before we go sifting
+	 * through the radio group for the current action. */
+	g_signal_connect_data (
 		widget, "changed",
-		G_CALLBACK (e_shell_view_execute_search), shell_view);
+		G_CALLBACK (e_shell_view_execute_search),
+		shell_view, (GClosureNotify) NULL,
+		G_CONNECT_AFTER | G_CONNECT_SWAPPED);
 
 	widget = searchbar->priv->search_entry;