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 --- calendar/ChangeLog | 5 +++++ calendar/gui/cal-search-bar.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f443f2c029..fccc526224 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2001-08-10 Jon Trowbridge + + * gui/cal-search-bar.c: Where we have ESearchBarItems, set their + subitems to NULL. + 2001-08-09 Damon Chaplin * pcs/cal-backend.c (cal_backend_get_object_component): added new diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index 5ffbfcdb82..f02528a8eb 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -39,7 +39,7 @@ /* Menu items for the ESearchBar */ static ESearchBarItem search_menu_items[] = { E_FILTERBAR_RESET, - { NULL, -1 } + { NULL, -1, NULL } }; /* IDs and option items for the ESearchBar */ @@ -51,11 +51,11 @@ enum { }; static ESearchBarItem search_option_items[] = { - { N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS }, - { N_("Summary contains"), SEARCH_SUMMARY_CONTAINS }, - { N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS }, - { N_("Comment contains"), SEARCH_COMMENT_CONTAINS }, - { NULL, -1 } + { N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, NULL }, + { N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, NULL }, + { N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, NULL }, + { N_("Comment contains"), SEARCH_COMMENT_CONTAINS, NULL }, + { NULL, -1, NULL } }; /* Private part of the CalSearchBar structure */ -- cgit v1.2.3