Bug 600402 - Clear search is always enabled in calendar/contact/task

4 files changed, 4 insertions, 16 deletions

diff --git a/modules/addressbook/e-book-shell-view.c b/modules/addressbook/e-book-shell-view.c
index 4a09a14825..8ea97caddc 100644
--- a/modules/addressbook/e-book-shell-view.c
+++ b/modules/addressbook/e-book-shell-view.c
@@ -131,7 +131,6 @@ book_shell_view_execute_search (EShellView *shell_view)
 	GString *string;
 	EAddressbookView *view;
 	EAddressbookModel *model;
-	EFilterRule *rule;
 	const gchar *format;
 	const gchar *text;
 	gchar *query;
@@ -211,9 +210,7 @@ book_shell_view_execute_search (EShellView *shell_view)
 	/* XXX This is wrong.  We need to programmatically construct an
 	 *     EFilterRule, tell it to build code, and pass the resulting
 	 *     expression string to EAddressbookModel. */
-	rule = e_filter_rule_new ();
-	e_shell_content_set_search_rule (shell_content, rule);
-	g_object_unref (rule);
+	e_shell_content_set_search_rule (shell_content, NULL);
 
 	/* Submit the query. */
 	book_shell_content = E_BOOK_SHELL_CONTENT (shell_content);
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 41782deb7f..392f1fb0bc 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -63,7 +63,6 @@ cal_shell_view_execute_search (EShellView *shell_view)
 	ECalendar *date_navigator;
 	GtkRadioAction *action;
 	GString *string;
-	EFilterRule *rule;
 	const gchar *format;
 	const gchar *text;
 	time_t start_range;
@@ -182,9 +181,7 @@ cal_shell_view_execute_search (EShellView *shell_view)
 	/* XXX This is wrong.  We need to programmatically construct an
 	 *     EFilterRule, tell it to build code, and pass the resulting
 	 *     expressing string to ECalModel. */
-	rule = e_filter_rule_new ();
-	e_shell_content_set_search_rule (shell_content, rule);
-	g_object_unref (rule);
+	e_shell_content_set_search_rule (shell_content, NULL);
 
 	cal_shell_sidebar = E_CAL_SHELL_SIDEBAR (shell_sidebar);
 	date_navigator = e_cal_shell_sidebar_get_date_navigator (cal_shell_sidebar);
diff --git a/modules/calendar/e-memo-shell-view.c b/modules/calendar/e-memo-shell-view.c
index f5698fe9b7..a391d6b7a9 100644
--- a/modules/calendar/e-memo-shell-view.c
+++ b/modules/calendar/e-memo-shell-view.c
@@ -62,7 +62,6 @@ memo_shell_view_execute_search (EShellView *shell_view)
 	ECalComponentPreview *memo_preview;
 	EMemoTable *memo_table;
 	ECalModel *model;
-	EFilterRule *rule;
 	const gchar *format;
 	const gchar *text;
 	gchar *query;
@@ -138,9 +137,7 @@ memo_shell_view_execute_search (EShellView *shell_view)
 	/* XXX This is wrong.  We need to programmatically construct an
 	 *     EFilterRule, tell it to build code, and pass the resulting
 	 *     expression string to ECalModel. */
-	rule = e_filter_rule_new ();
-	e_shell_content_set_search_rule (shell_content, rule);
-	g_object_unref (rule);
+	e_shell_content_set_search_rule (shell_content, NULL);
 
 	/* Submit the query. */
 	memo_shell_content = E_MEMO_SHELL_CONTENT (shell_content);
diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c
index ec7d697a9d..72d6c1d117 100644
--- a/modules/calendar/e-task-shell-view.c
+++ b/modules/calendar/e-task-shell-view.c
@@ -101,7 +101,6 @@ task_shell_view_execute_search (EShellView *shell_view)
 	ECalComponentPreview *task_preview;
 	ECalendarTable *task_table;
 	ECalModel *model;
-	EFilterRule *rule;
 	const gchar *format;
 	const gchar *text;
 	time_t start_range;
@@ -250,9 +249,7 @@ task_shell_view_execute_search (EShellView *shell_view)
 	/* XXX This is wrong.  We need to programmatically construct an
 	 *     EFilterRule, tell it to build code, and pass the resulting
 	 *     expression string to ECalModel. */
-	rule = e_filter_rule_new ();
-	e_shell_content_set_search_rule (shell_content, rule);
-	g_object_unref (rule);
+	e_shell_content_set_search_rule (shell_content, NULL);
 
 	/* Submit the query. */
 	task_shell_content = E_TASK_SHELL_CONTENT (shell_content);