Simplify the search UI for express mode.

For express mode:

- Move the search bar up to the toolbar.

- Hide the "filter" combo box and lock down the first item.

- Hide the "scope" combo box and lock down the first item.
  (This is the combo box with "Current Folder" only in the mailer.)

- EShellView owns the search bar widget now instead of EShellContent.

- Insert several nasty hacks that will likely come back to bite me.

Conflicts:

	doc/reference/shell/eshell-sections.txt

1 files changed, 2 insertions, 6 deletions

diff --git a/shell/e-shell-content.h b/shell/e-shell-content.h
index 7a852145e4..e6a11291a7 100644
--- a/shell/e-shell-content.h
+++ b/shell/e-shell-content.h
@@ -68,22 +68,18 @@ struct _EShellContentClass {
 
 	/* Methods */
 	guint32		(*check_state)		(EShellContent *shell_content);
-	gchar *		(*get_search_name)	(EShellContent *shell_content);
-
-	/* This is a protected method.  Not for public use. */
-	GtkWidget *	(*construct_searchbar)	(EShellContent *shell_content);
 };
 
 GType		e_shell_content_get_type	(void);
 GtkWidget *	e_shell_content_new		(struct _EShellView *shell_view);
-GtkWidget *	e_shell_content_get_searchbar	(EShellContent *shell_content);
+void		e_shell_content_set_searchbar	(EShellContent *shell_content,
+						 GtkWidget *searchbar);
 guint32		e_shell_content_check_state	(EShellContent *shell_content);
 struct _EShellView *
 		e_shell_content_get_shell_view	(EShellContent *shell_content);
 const gchar *	e_shell_content_get_view_id	(EShellContent *shell_content);
 void		e_shell_content_set_view_id	(EShellContent *shell_content,
 						 const gchar *view_id);
-gchar *		e_shell_content_get_search_name	(EShellContent *shell_content);
 void		e_shell_content_run_advanced_search_dialog
 						(EShellContent *shell_content);
 void		e_shell_content_run_edit_searches_dialog