aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/cal-search-bar.c12
2 files changed, 11 insertions, 6 deletions
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 <trow@ximian.com>
+
+ * gui/cal-search-bar.c: Where we have ESearchBarItems, set their
+ subitems to NULL.
+
2001-08-09 Damon Chaplin <damon@ximian.com>
* 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 */