From 3a11574695e84d795dd0e5e7cf133d92f0f23dfa Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 28 Oct 2002 22:37:53 +0000 Subject: Emit a search_activated signal. (e_search_bar_set_item_id): Revert to 2002-10-28 Jeffrey Stedfast * e-search-bar.c (clear_search): Emit a search_activated signal. (e_search_bar_set_item_id): Revert to original implementation. svn path=/trunk/; revision=18464 --- widgets/misc/ChangeLog | 5 +++++ widgets/misc/e-search-bar.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'widgets') diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index abb7449a3c..94109a5bd9 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,8 @@ +2002-10-28 Jeffrey Stedfast + + * e-search-bar.c (clear_search): Emit a search_activated signal. + (e_search_bar_set_item_id): Revert to original implementation. + 2002-10-23 Jeffrey Stedfast * e-filter-bar.c (option_changed): If the clear button was diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 76a26f0e98..da3bcb0803 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -70,6 +70,7 @@ enum { /* Forward decls. */ static void emit_search_activated (ESearchBar *esb); +static void emit_query_changed (ESearchBar *esb); /* Utility functions. */ @@ -99,7 +100,8 @@ static void clear_search (ESearchBar *esb) { e_search_bar_set_text (esb, ""); - e_search_bar_set_item_id (esb, E_SEARCHBAR_CLEAR_ID); + e_search_bar_set_item_id (esb, 0); + emit_search_activated (esb); } /* Frees an array of subitem information */ @@ -1077,8 +1079,7 @@ e_search_bar_set_item_id (ESearchBar *search_bar, int id) g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - row = id == E_SEARCHBAR_CLEAR_ID ? 0 : id; - row = find_id (search_bar->option_menu, row, "EsbChoiceId", NULL); + row = find_id (search_bar->option_menu, id, "EsbChoiceId", NULL); g_return_if_fail (row != -1); search_bar->item_id = id; -- cgit