From 78544223ad29c9e74282134663370c3c71360f1b Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Fri, 10 Aug 2001 22:36:41 +0000 Subject: Removed comment about the need to resolve nicknames properly, because we 2001-08-10 Jon Trowbridge * e-msg-composer-hdrs.c (set_recipients): Removed comment about the need to resolve nicknames properly, because we now do that. 2001-08-10 Jon Trowbridge * e-filter-bar.h: Set the subitems to NULL in the pre-defined ESearchBarItems. * e-filter-bar.c (rule_editor_clicked): Set the ESearchBarItem's subitems to NULL. (build_items): Set the ESearchBarItem's subitems to NULL. (e_filter_bar_new): Set the ESearchBarItem's subitems to NULL. * e-search-bar.c: Added support for subitems, so that a search option can key off of another option menu rather than just an entry. 2001-08-10 Jon Trowbridge * gui/component/addressbook.c: Set the ESearchBarItem subitems explicitly to NULL. 2001-08-10 Jon Trowbridge * gui/cal-search-bar.c: Where we have ESearchBarItems, set their subitems to NULL. 2001-08-10 Jon Trowbridge * folder-browser.c: Set our ESearchBarItems subitems to NULL. svn path=/trunk/; revision=11904 --- widgets/misc/e-filter-bar.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'widgets/misc/e-filter-bar.c') diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 42ec5279e0..80fcc0b3f7 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -97,6 +97,7 @@ rule_editor_clicked (GtkWidget *dialog, int button, void *data) item.text = rule->name; item.id = efb->menu_base + efb->menu_rules->len; + item.subitems = NULL; g_ptr_array_add (efb->menu_rules, rule); @@ -303,6 +304,7 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA /* and add ours */ item.id = 0; item.text = NULL; + item.subitems = NULL; g_array_append_vals (menu, &item, 1); source = FILTER_SOURCE_INCOMING; } else { @@ -312,6 +314,7 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA while ((rule = rule_context_next_rule (efb->context, rule, source))) { item.id = id++; item.text = rule->name; + item.subitems = NULL; g_array_append_vals (menu, &item, 1); g_ptr_array_add (rules, rule); } @@ -324,6 +327,7 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA item.id = -1; item.text = NULL; + item.subitems = NULL; g_array_append_vals (menu, &item, 1); return menu; @@ -455,7 +459,7 @@ e_filter_bar_new (RuleContext *context, const char *systemrules, const char *use EFilterBarConfigRule config, void *data) { EFilterBar *bar; - ESearchBarItem item = { NULL, -1 }; + ESearchBarItem item = { NULL, -1, NULL }; bar = gtk_type_new (e_filter_bar_get_type ()); -- cgit v1.2.3