Updated to use the ESearchBar object rather than the previously used

2000-11-07  Jeffrey Stedfast  <fejj@helixcode.com>

	* folder-browser.c (search_full_clicked): Updated to use the
	ESearchBar object rather than the previously used search widgets.
	(search_full): Same.
	(search_save): Same. Also use enums to make it a little easier to
	read now that we have to have enums anyway.
	(folder_browser_search_menu_activated): New ESearchBar menu
	callback.
	(folder_browser_search_query_changed): New ESearchBar query
	callback. Replaces search_set()
	(folder_browser_clear_search): Updated to use the ESearchBar
	object rather than the previously used search widgets.
	(folder_browser_gui_init): Don't hand construct a search widget,
	use the new ESearchBar convenience widget.

	* mail-ops.c (cleanup_load_folder): Updated to reflect changes to
	FolderBrowser.

svn path=/trunk/; revision=6490

1 files changed, 3 insertions, 2 deletions

diff --git a/mail/folder-browser.h b/mail/folder-browser.h
index 6bddba18c5..7ddc9a1954 100644
--- a/mail/folder-browser.h
+++ b/mail/folder-browser.h
@@ -8,6 +8,7 @@
 #include <gtk/gtktable.h>
 #include "camel/camel-stream.h"
 #include <bonobo/bonobo-property-bag.h>
+#include "filter/e-search-bar.h"
 #include "filter/filter-rule.h"
 #include "filter/filter-context.h" /*eek*/
 #include "message-list.h"
@@ -41,8 +42,8 @@ struct  _FolderBrowser {
 	GtkWidget   *message_list_w;
 	MailDisplay *mail_display;
 	GtkWidget   *vpaned;
-	GtkWidget   *search_menu;
-	GtkWidget   *search_entry;
+	
+	ESearchBar  *search;
 	FilterRule  *search_full; /* if we have a full search active */
 
 	gboolean     preview_shown;