diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/cal-search-bar.c | 20 |
2 files changed, 15 insertions, 10 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 99b3d7e9b7..a1af106e76 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2001-08-16 Jon Trowbridge <trow@ximian.com> + + * gui/cal-search-bar.c: Changed to reflect my renaming of some of + the more hideously-named functions in the ESearchBar API. + 2001-08-15 JP Rosevear <jpr@ximian.com> * gui/dialogs/comp-editor.c (save_comp): only fill the component diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index b6fde4e6f4..e35ba63181 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -234,25 +234,25 @@ static const char * get_current_category (CalSearchBar *cal_search) { CalSearchBarPrivate *priv; - int option, suboption; + int id, subid; priv = cal_search->priv; g_assert (priv->categories != NULL); - option = e_search_bar_get_option_choice (E_SEARCH_BAR (cal_search)); - if (option != SEARCH_CATEGORY_IS) + id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search)); + if (id != SEARCH_CATEGORY_IS) return NULL; - suboption = e_search_bar_get_suboption_choice (E_SEARCH_BAR (cal_search)); - if (suboption == CATEGORIES_ALL) + subid = e_search_bar_get_subitem_id (E_SEARCH_BAR (cal_search)); + if (subid == CATEGORIES_ALL) return (const char *) 1; - else if (suboption == CATEGORIES_UNMATCHED) + else if (subid == CATEGORIES_UNMATCHED) return NULL; else { int i; - i = suboption - CATEGORIES_OFFSET; + i = subid - CATEGORIES_OFFSET; g_assert (i >= 0 && i < priv->categories->len); return priv->categories->pdata[i]; @@ -317,18 +317,18 @@ static void regen_query (CalSearchBar *cal_search) { CalSearchBarPrivate *priv; - int item; + int id; const char *category; priv = cal_search->priv; /* Fetch the data from the ESearchBar's entry widgets */ - item = e_search_bar_get_option_choice (E_SEARCH_BAR (cal_search)); + id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search)); /* Generate the different types of queries */ - switch (item) { + switch (id) { case SEARCH_ANY_FIELD_CONTAINS: notify_query_contains (cal_search, "any"); break; |