From fef28ce070e3d25b8837ca8015936cb6b7ddf08d Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Thu, 16 Aug 2001 06:17:18 +0000 Subject: Boost scoring on an exact nickname match. Manually addressify match. 2001-08-16 Jon Trowbridge * gui/component/select-names/e-select-names-completion.c (match_nickname): Boost scoring on an exact nickname match. Manually addressify match. (match_name): Manually addressify matches. (book_query_score): Remove automatic addressification. * gui/component/addressbook.c (addressbook_query_changed): Minor tweak to avoid a crash if we have a negative subid with id ESB_CATEGORY. This should never happen. (addressbook_menu_activated): Reset the entry/option when we select "Clear". Some changes to reflect renaming in ESearchBar. * gui/component/select-names/e-select-names-bonobo.c (entry_set_property_fn): Cardify after importing destinations. This might fix a problem that Damon is having. 2001-08-16 Jon Trowbridge * e-filter-bar.c (option_changed): Adjusted for renamed ESearchBar functions. (menubar_activated): Adjusted for renamed ESearchBar functions. * e-search-bar.c: Renames some of the horrible function names: s/option_choice/item_id/, s/suboption_choice/subitem_id/. 2001-08-16 Jon Trowbridge * gui/cal-search-bar.c: Changed to reflect my renaming of some of the more hideously-named functions in the ESearchBar API. svn path=/trunk/; revision=12081 --- widgets/misc/e-filter-bar.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (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 80fcc0b3f7..b2aba149da 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -146,8 +146,8 @@ menubar_activated (ESearchBar *esb, int id, void *data) case E_FILTERBAR_RESET_ID: d(printf("Reset menu\n")); efb->current_query = NULL; - gtk_object_set (GTK_OBJECT (esb), "option_choice", efb->option_base, NULL); - gtk_object_set (GTK_OBJECT (esb), "text", NULL, NULL); + e_search_bar_set_item_id (esb, efb->option_base); + e_search_bar_set_text (esb, NULL); gtk_widget_set_sensitive (esb->entry, TRUE); break; case E_FILTERBAR_EDIT_ID: @@ -203,7 +203,8 @@ menubar_activated (ESearchBar *esb, int id, void *data) efb->current_query = (FilterRule *)efb->menu_rules->pdata[id - efb->menu_base]; efb->setquery = TRUE; - gtk_object_set (GTK_OBJECT (esb), "option_choice", E_FILTERBAR_ADVANCED_ID, NULL); + + e_search_bar_set_item_id (esb, E_FILTERBAR_ADVANCED_ID); gtk_widget_set_sensitive (esb->entry, FALSE); } else { @@ -219,7 +220,7 @@ static void option_changed (ESearchBar *esb, void *data) { EFilterBar *efb = (EFilterBar *)esb; - int id = esb->option_choice; + int id = e_search_bar_get_item_id (esb); char *query; d(printf("option changed, id = %d\n", id)); -- cgit v1.2.3