Don't add the menu item here, do this in the context_changed signal

2001-10-23  Jeffrey Stedfast  <fejj@ximian.com>

	* e-filter-bar.c (rule_editor_clicked): Don't add the menu item
	here, do this in the context_changed signal callback instead.
	(context_changed): rebuild the search menu.
	(set_menu): Copy the items into a default_items list so we can
	regenerate the menu when something changes. Then call
	generate_menu().
	(generate_menu): Do what set_menu() used to do.
	(e_filter_bar_new): Don't do a rule_context_load() anymore since
	we don't need to.
	(destroy): free the default_items list.

svn path=/trunk/; revision=13975

1 files changed, 12 insertions, 10 deletions

diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index 87cecf2488..1a059ce94c 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -53,22 +53,23 @@ typedef struct _EFilterBarClass  EFilterBarClass;
 
 typedef void (*EFilterBarConfigRule)(EFilterBar *, FilterRule *rule, int id, const char *query, void *data);
 
-struct _EFilterBar
-{
+struct _EFilterBar {
 	ESearchBar parent;
-
+	
 	int menu_base, option_base;
 	GPtrArray *menu_rules, *option_rules;
-
+	
+	ESearchBarItem *default_items;
+	
 	GtkWidget *save_dialogue; /* current save dialogue (so we dont pop up multiple ones) */
-
+	
 	FilterRule *current_query; /* as it says */
 	int setquery;		/* true when we're setting a query directly to advanced, so dont popup the dialogue */
-
+	
 	RuleContext *context;
 	char *systemrules;
 	char *userrules;
-
+	
 	EFilterBarConfigRule config;
 	void *config_data;
 };
@@ -105,9 +106,10 @@ const char * strings[] = {
 };
 #endif
 
-
-GtkType    e_filter_bar_get_type   (void);
-EFilterBar*e_filter_bar_new        (RuleContext *, const char *sys, const char *user, EFilterBarConfigRule config, void *data);
+
+GtkType     e_filter_bar_get_type (void);
+EFilterBar *e_filter_bar_new      (RuleContext *context, const char *systemrules, const char *userrules,
+				   EFilterBarConfigRule config, void *data);
 
 #ifdef __cplusplus
 }