Fixes #53643 and #26903.

2004-06-03  Hans Petter Jansson  <hpj@ximian.com>

	Fixes #53643 and #26903.

	* gui/search/addresstypes.xml: category -> category_list

	* gui/search/e-addressbook-search-dialog.c (get_widget): Get
	filter rule from parent view.
	(eab_search_dialog_set_property): Implement.
	(eab_search_dialog_get_property): Impleent.
	(eab_search_dialog_class_init): Set up property methods.
	(get_query): Get filter rule from parent view.
	(eab_search_dialog_init): Don't get the filter widget here,
	wait until parent view property is set.
	(eab_search_dialog_new): Don't poke the parent view in, set it
	as a property instead.
	(eab_search_dialog_dispose): No longer needs to unref rule.

	* gui/search/e-addressbook-search-dialog.c: EABSearchDialog no
	longer needs to keep rule internally.

	* gui/widgets/Makefile.am: Set SEARCH_RULE_DIR define.

	* gui/widgets/e-addressbook-view.c (eab_view_new): Set up filter
	rule and context.
	(eab_view_peek_search_context): Implement.
	(eab_view_peek_search_rule): Implement.

	* gui/widgets/e-addressbook-view.h: Keep track of filter rule
	and context. Add protos for added API.

svn path=/trunk/; revision=26207

1 files changed, 7 insertions, 3 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index c90356beee..6f937f4587 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -92,9 +92,10 @@ struct _EABView
 	BonoboUIComponent *uic;
 
 	/* the search bar and related machinery */
-	ESearchBar *search;
-	gint        ecml_changed_id;
-
+	ESearchBar  *search;
+	gint         ecml_changed_id;
+	RuleContext *search_context;
+	FilterRule  *search_rule;
 };
 
 struct _EABViewClass
@@ -119,6 +120,9 @@ void       eab_view_setup_menus         (EABView  *view,
 					 BonoboUIComponent *uic);
 void       eab_view_discard_menus       (EABView  *view);
 
+RuleContext *eab_view_peek_search_context (EABView *view);
+FilterRule  *eab_view_peek_search_rule    (EABView *view);
+
 void       eab_view_save_as             (EABView  *view);
 void       eab_view_view                (EABView  *view);
 void       eab_view_send                (EABView  *view);