aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-03-19 04:06:00 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-03-19 04:06:00 +0800
commit6f9b8ecfb38192df1c8bca8ac34db6c3eae254aa (patch)
treee21aa020a307fb81b48babe2980a28687f17f9f0 /addressbook
parent16af96a2ab47b8f58f1c86380162e26530842868 (diff)
downloadgsoc2013-evolution-6f9b8ecfb38192df1c8bca8ac34db6c3eae254aa.tar
gsoc2013-evolution-6f9b8ecfb38192df1c8bca8ac34db6c3eae254aa.tar.gz
gsoc2013-evolution-6f9b8ecfb38192df1c8bca8ac34db6c3eae254aa.tar.bz2
gsoc2013-evolution-6f9b8ecfb38192df1c8bca8ac34db6c3eae254aa.tar.lz
gsoc2013-evolution-6f9b8ecfb38192df1c8bca8ac34db6c3eae254aa.tar.xz
gsoc2013-evolution-6f9b8ecfb38192df1c8bca8ac34db6c3eae254aa.tar.zst
gsoc2013-evolution-6f9b8ecfb38192df1c8bca8ac34db6c3eae254aa.zip
[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
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog15
-rw-r--r--addressbook/gui/component/addressbook.c24
2 files changed, 16 insertions, 23 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 64a6c4b6cf..57e7c81f98 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-18 Ettore Perazzoli <ettore@ximian.com>
+
+ * 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.
+
2002-03-15 Jeffrey Stedfast <fejj@ximian.com>
* gui/widgets/e-addressbook-view.c (table_right_click): Update to
@@ -12,6 +20,13 @@
2002-03-15 Ettore Perazzoli <ettore@ximian.com>
+ * gui/component/addressbook.c: Remove the
+ `addressbook_search_menu_items'.
+ (addressbook_menu_activated): Removed.
+ (addressbook_factory_new_control): Don't connect. No menu items.
+
+2002-03-15 Ettore Perazzoli <ettore@ximian.com>
+
* gui/component/addressbook.c (control_activate): Call
`e_search_bar_set_ui_component()' to set the BonoboUIComponent for
the search bar.
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index a0f9bda94b..02428c1350 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -813,11 +813,6 @@ set_prop (BonoboPropertyBag *bag,
}
}
-static ESearchBarItem addressbook_search_menu_items[] = {
- E_FILTERBAR_RESET,
- { NULL, -1, NULL },
-};
-
enum {
ESB_FULL_NAME,
ESB_EMAIL,
@@ -849,20 +844,6 @@ alphabet_state_changed (EAddressbookView *eav, gunichar letter, AddressbookView
}
static void
-addressbook_menu_activated (ESearchBar *esb, int id, AddressbookView *view)
-{
- switch (id) {
- case E_FILTERBAR_RESET_ID:
- /* e_addressbook_view_show_all(view->view); */
- view->ignore_search_changes = TRUE;
- e_search_bar_set_item_id (view->search, ESB_ANY);
- view->ignore_search_changes = FALSE;
- e_search_bar_set_text (esb, "");
- break;
- }
-}
-
-static void
addressbook_search_activated (ESearchBar *esb, AddressbookView *view)
{
ECategoriesMasterList *master_list;
@@ -1127,8 +1108,7 @@ addressbook_factory_new_control (void)
/* Create the control. */
view->control = bonobo_control_new (view->vbox);
- view->search = E_SEARCH_BAR(e_search_bar_new(addressbook_search_menu_items,
- addressbook_search_option_items));
+ view->search = E_SEARCH_BAR (e_search_bar_new (NULL, addressbook_search_option_items));
make_suboptions (view);
connect_master_list_changed (view);
@@ -1138,8 +1118,6 @@ addressbook_factory_new_control (void)
GTK_SIGNAL_FUNC (addressbook_query_changed), view);
gtk_signal_connect (GTK_OBJECT (view->search), "search_activated",
GTK_SIGNAL_FUNC (addressbook_search_activated), view);
- gtk_signal_connect (GTK_OBJECT (view->search), "menu_activated",
- GTK_SIGNAL_FUNC (addressbook_menu_activated), view);
view->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());
gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (view->view));