[evolution] Bug 609304 - Search scope forgotten if search is not performed

[Matthew Barnes <mbarnes src gnome org>]

commit 7f3440fc9e5c9fb604fbfe39f0376b5b6fd68902
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Feb 8 11:20:55 2010 -0500

    Bug 609304 - Search scope forgotten if search is not performed

 shell/e-shell-searchbar.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 2b8ae33..13ff2ad 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -974,10 +974,14 @@ shell_searchbar_init (EShellSearchbar *searchbar)
 	searchbar->priv->scope_combo_box = widget;
 	gtk_widget_show (widget);
 
-	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_searchbar_set_state_dirty),
-		searchbar);
+		G_CALLBACK (shell_searchbar_save_search_scope),
+		searchbar, (GClosureNotify) NULL,
+		G_CONNECT_AFTER | G_CONNECT_SWAPPED);
 }
 
 GType