pass view->view instead of the EBook. (addressbook_search_menu_items):

2001-08-07  Chris Toshok  <toshok@ximian.com>

	* gui/component/addressbook.c (search_cb): pass view->view instead
	of the EBook.
	(addressbook_search_menu_items): remove E_FILTERBAR_ADVANCED.
	(addressbook_menu_activated): remove E_FILTERBAR_ADVANCED.
	(addressbook_search_option_items): add "Advanced..." here.
	(addressbook_query_changed): add special handling for Advanced...

	* gui/search/e-addressbook-search-dialog.h (struct
	_EAddressbookSearchDialog): add EAddressbookView and remove the
	model/adapter fields.  Also fix prototype of
	e_addressbook_search_dialog_new.

	* gui/search/e-addressbook-search-dialog.c
	(e_addressbook_search_dialog_class_init): get rid of
	set_arg/get_arg.
	(button_press): set the query on the EAddressbookView, and always
	close the dialog.
	(e_addressbook_search_dialog_init): get rid of the minicard view,
	and pack the other widgets accordingly.
	(e_addressbook_search_dialog_new): pass EAddressbookView instead
	of EBook.
	(e_addressbook_search_dialog_destroy): remove model/adapter stuff.

svn path=/trunk/; revision=11760

1 files changed, 3 insertions, 7 deletions

diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h
index 9bc4c6ac18..86b30056d3 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ b/addressbook/gui/search/e-addressbook-search-dialog.h
@@ -23,8 +23,7 @@
 
 #include <ebook/e-book.h>
 
-#include "addressbook/gui/widgets/e-addressbook-model.h"
-#include "addressbook/gui/widgets/e-addressbook-reflow-adapter.h"
+#include "addressbook/gui/widgets/e-addressbook-view.h"
 #include "filter/rule-context.h"
 #include "filter/filter-rule.h"
 
@@ -50,14 +49,11 @@ struct _EAddressbookSearchDialog
 	GnomeDialog parent;
 
 	GtkWidget *search;
-	GtkWidget *view;
 
-	EAddressbookModel *model;
-	EAddressbookReflowAdapter *adapter;
+	EAddressbookView *view;
 
 	RuleContext *context;
 	FilterRule *rule;
-	GtkWidget *scrolled_window;
 };
 
 struct _EAddressbookSearchDialogClass
@@ -67,7 +63,7 @@ struct _EAddressbookSearchDialogClass
 
 GtkType    e_addressbook_search_dialog_get_type (void);
 
-GtkWidget *e_addressbook_search_dialog_new (EBook *book);
+GtkWidget *e_addressbook_search_dialog_new (EAddressbookView *view);
 
 #ifdef __cplusplus
 }