[Search bar re-design implementation, Take 2.]

* e-search-bar.c (clear_verb_cb): New.
(setup_standard_verbs): New.
(e_search_bar_set_ui_component): Call it if a new
BonoboUIComponent is set.
(append_xml_menu_item): New helper function.
(update_bonobo_menus): Use it.  Also add a "Clear" menu item.
(e_search_bar_construct): @menu_items can be NULL now.
(e_search_bar_new): Same here.
(set_menu): Work with NULL items.

* e-filter-bar.c (menubar_activated): Don't handle
E_FILTERBAR_RESET_ID anymore.

* e-filter-bar.h: Remove `E_FILTERBAR_RESET_ID' and `E_FILTERBAR_RESET'.

* folder-browser.c: Remove E_FILTERBAR_RESET menu entry.

* gui/cal-search-bar.c: Removed `search_menu_items'.
(cal_search_bar_menu_activated): Removed.
(cal_search_bar_class_init): Don't install.
(cal_search_bar_construct): No menu items here.

* gui/component/addressbook.c (addressbook_menu_activated):
Removed.
(addressbook_factory_new_control): Don't connect anymore, as this
signal has been removed from the ESearchBar.
(addressbook_factory_new_control): No more custom menu items here.

svn path=/trunk/; revision=16194

2 files changed, 8 insertions, 31 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 85c66502e8..89599907dd 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-18  Ettore Perazzoli  <ettore@ximian.com>
+
+	* gui/cal-search-bar.c: Removed `search_menu_items'.
+	(cal_search_bar_menu_activated): Removed.
+	(cal_search_bar_class_init): Don't install.
+	(cal_search_bar_construct): No menu items here.
+
 2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* gui/e-day-view.c: Updated to use new EPopupMenu API.
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 329795c518..2483b2b126 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -36,12 +36,6 @@
 
 
 
-/* Menu items for the ESearchBar */
-static ESearchBarItem search_menu_items[] = {
-	E_FILTERBAR_RESET,
-	{ NULL, -1, NULL }
-};
-
 /* IDs and option items for the ESearchBar */
 enum {
 	SEARCH_ANY_FIELD_CONTAINS,
@@ -78,7 +72,6 @@ static void cal_search_bar_init (CalSearchBar *cal_search);
 static void cal_search_bar_destroy (GtkObject *object);
 
 static void cal_search_bar_search_activated (ESearchBar *search);
-static void cal_search_bar_menu_activated (ESearchBar *search, int item);
 
 static ESearchBarClass *parent_class = NULL;
 
@@ -160,7 +153,6 @@ cal_search_bar_class_init (CalSearchBarClass *class)
 	class->category_changed = NULL;
 
 	e_search_bar_class->search_activated = cal_search_bar_search_activated;
-	e_search_bar_class->menu_activated = cal_search_bar_menu_activated;
 
 	object_class->destroy = cal_search_bar_destroy;
 }
@@ -368,28 +360,6 @@ cal_search_bar_search_activated (ESearchBar *search)
 	regen_query (cal_search);
 }
 
-/* menu_activated handler for the calendar search bar */
-static void
-cal_search_bar_menu_activated (ESearchBar *search, int item)
-{
-	CalSearchBar *cal_search;
-
-	cal_search = CAL_SEARCH_BAR (search);
-
-	switch (item) {
-	case E_FILTERBAR_RESET_ID:
-		notify_sexp_changed (cal_search, "#t"); /* match all */
-		/* FIXME: should we change the rest of the search bar so that
-		 * the user sees that he selected "show all" instead of some
-		 * type/text search combination?
-		 */
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
 
 
 /* Creates the suboptions menu for the ESearchBar with the list of categories */
@@ -464,7 +434,7 @@ cal_search_bar_construct (CalSearchBar *cal_search)
 	g_return_val_if_fail (cal_search != NULL, NULL);
 	g_return_val_if_fail (IS_CAL_SEARCH_BAR (cal_search), NULL);
 
-	e_search_bar_construct (E_SEARCH_BAR (cal_search), search_menu_items, search_option_items);
+	e_search_bar_construct (E_SEARCH_BAR (cal_search), NULL, search_option_items);
 	make_suboptions (cal_search);
 
 	e_search_bar_set_ids (E_SEARCH_BAR (cal_search), SEARCH_CATEGORY_IS, CATEGORIES_ALL);