Get mail search bar partially working without help from EFilterBar.

Search scope (current folder, current account, etc.) is still ignored.

svn path=/branches/kill-bonobo/; revision=37263

2 files changed, 1 insertions, 52 deletions

diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index aaa4bb47fa..e83bb341ef 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -66,7 +66,6 @@ enum {
 	PROP_SEARCH_CONTEXT,
 	PROP_SEARCH_RULE,
 	PROP_SEARCH_TEXT,
-	PROP_SEARCH_VALUE,
 	PROP_SEARCH_VISIBLE,
 	PROP_SCOPE_ACTION,
 	PROP_SCOPE_VALUE,
@@ -78,7 +77,7 @@ static gpointer parent_class;
 
 static void
 shell_content_dialog_rule_changed (GtkWidget *dialog,
-                                            FilterRule *rule)
+                                   FilterRule *rule)
 {
 	gboolean sensitive;
 
@@ -318,12 +317,6 @@ shell_content_set_property (GObject *object,
 				g_value_get_string (value));
 			return;
 
-		case PROP_SEARCH_VALUE:
-			e_shell_content_set_search_value (
-				E_SHELL_CONTENT (object),
-				g_value_get_int (value));
-			return;
-
 		case PROP_SEARCH_VISIBLE:
 			e_shell_content_set_search_visible (
 				E_SHELL_CONTENT (object),
@@ -401,12 +394,6 @@ shell_content_get_property (GObject *object,
 				E_SHELL_CONTENT (object)));
 			return;
 
-		case PROP_SEARCH_VALUE:
-			g_value_set_int (
-				value, e_shell_content_get_search_value (
-				E_SHELL_CONTENT (object)));
-			return;
-
 		case PROP_SEARCH_VISIBLE:
 			g_value_set_boolean (
 				value, e_shell_content_get_search_visible (
@@ -725,18 +712,6 @@ shell_content_class_init (EShellContentClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_SEARCH_VALUE,
-		g_param_spec_int (
-			"search-value",
-			NULL,
-			NULL,
-			G_MININT,
-			G_MAXINT,
-			0,
-			G_PARAM_READWRITE));
-
-	g_object_class_install_property (
-		object_class,
 		PROP_SEARCH_VISIBLE,
 		g_param_spec_boolean (
 			"search-visible",
@@ -1138,26 +1113,6 @@ e_shell_content_set_search_text (EShellContent *shell_content,
 	g_object_notify (G_OBJECT (shell_content), "search-text");
 }
 
-gint
-e_shell_content_get_search_value (EShellContent *shell_content)
-{
-	g_return_val_if_fail (E_IS_SHELL_CONTENT (shell_content), 0);
-
-	/* FIXME */
-	return 0;
-}
-
-void
-e_shell_content_set_search_value (EShellContent *shell_content,
-                                  gint search_value)
-{
-	g_return_if_fail (E_IS_SHELL_CONTENT (shell_content));
-
-	/* FIXME */
-
-	g_object_notify (G_OBJECT (shell_content), "search-value");
-}
-
 gboolean
 e_shell_content_get_search_visible (EShellContent *shell_content)
 {
diff --git a/shell/e-shell-content.h b/shell/e-shell-content.h
index 98ec2c8f68..04639771f3 100644
--- a/shell/e-shell-content.h
+++ b/shell/e-shell-content.h
@@ -85,9 +85,6 @@ GtkWidget *	e_shell_content_new		(struct _EShellView *shell_view);
 guint32		e_shell_content_check_state	(EShellContent *shell_content);
 struct _EShellView *
 		e_shell_content_get_shell_view	(EShellContent *shell_content);
-RuleContext *	e_shell_content_get_context	(EShellContent *shell_content);
-void		e_shell_content_set_context	(EShellContent *shell_content,
-						 RuleContext *context);
 GtkRadioAction *e_shell_content_get_filter_action
 						(EShellContent *shell_content);
 void		e_shell_content_set_filter_action
@@ -115,9 +112,6 @@ void		e_shell_content_set_search_rule (EShellContent *shell_content,
 const gchar *	e_shell_content_get_search_text	(EShellContent *shell_content);
 void		e_shell_content_set_search_text	(EShellContent *shell_content,
 						 const gchar *search_text);
-gint		e_shell_content_get_search_value(EShellContent *shell_content);
-void		e_shell_content_set_search_value(EShellContent *shell_content,
-						 gint search_value);
 gboolean	e_shell_content_get_search_visible
 						(EShellContent *shell_content);
 void		e_shell_content_set_search_visible