diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 9 | ||||
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 14 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/Makefile.am | 1 |
4 files changed, 14 insertions, 11 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 18ad52edb1..1c7513e9c5 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,12 @@ +2001-05-07 Gediminas Paulauskas <menesis@delfi.lt> + + * gui/component/addressbook.c: use define from + widgets/misc/e-filter-bar.h instead of own enumeration and search menu + names. + + * gui/component/Makefile.am, gui/component/select-names/Makefile.am: + removed EVOLUTION_VERSION. + 2001-05-04 Chris Toshok <toshok@ximian.com> * gui/component/addressbook-component.c (remove_folder): un-#if 0 diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 3089f53901..de6e3f2337 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -15,7 +15,6 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ $(BONOBO_HTML_GNOME_CFLAGS) \ - -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 197de831fa..a67b004f31 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -35,6 +35,7 @@ #include <ebook/e-book.h> #include <widgets/misc/e-search-bar.h> +#include <widgets/misc/e-filter-bar.h> #define PROPERTY_FOLDER_URI "folder_uri" @@ -554,15 +555,10 @@ set_prop (BonoboPropertyBag *bag, } } -enum { - ESB_SHOW_ALL, - ESB_ADVANCED, -}; - static ESearchBarItem addressbook_search_menu_items[] = { - { N_("Show All"), ESB_SHOW_ALL }, + E_FILTERBAR_RESET, { NULL, 0 }, - { N_("Advanced..."), ESB_ADVANCED}, + E_FILTERBAR_ADVANCED, { NULL, -1 } }; @@ -571,10 +567,10 @@ addressbook_menu_activated (ESearchBar *esb, int id, AddressbookView *view) { EBook *book; switch (id) { - case ESB_SHOW_ALL: + case E_FILTERBAR_RESET_ID: e_addressbook_view_show_all(view->view); break; - case ESB_ADVANCED: + case E_FILTERBAR_ADVANCED_ID: gtk_object_get(GTK_OBJECT(view->view), "book", &book, NULL); diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index 2d877fdf6e..8c308d937a 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -39,7 +39,6 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ $(BONOBO_HTML_GNOME_CFLAGS) \ - -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ |