diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-12-10 05:24:20 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-12-10 05:24:20 +0800 |
| commit | 4f476ec48a182f891ea5a6db2908429b9110badb (patch) | |
| tree | 9a0a1997b3da72adfa0421d75de8c5ece4be3008 | |
| parent | 79178c27f26f7419c3e8f9ae2782ba3f3ab7de6b (diff) | |
| download | gsoc2013-evolution-4f476ec48a182f891ea5a6db2908429b9110badb.tar.gz gsoc2013-evolution-4f476ec48a182f891ea5a6db2908429b9110badb.tar.zst gsoc2013-evolution-4f476ec48a182f891ea5a6db2908429b9110badb.zip | |
remove PENDING_PORT_WORK. (addressbook_search_activated): same.
2002-12-09 Chris Toshok <toshok@ximian.com>
* gui/component/addressbook.c (search_cb): remove
PENDING_PORT_WORK.
(addressbook_search_activated): same.
(addressbook_query_changed): same.
* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
add libfilter.la back in.
svn path=/trunk/; revision=19069
| -rw-r--r-- | addressbook/ChangeLog | 10 | ||||
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 3 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index c97de169d1..8b6623aedd 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,13 @@ +2002-12-09 Chris Toshok <toshok@ximian.com> + + * gui/component/addressbook.c (search_cb): remove + PENDING_PORT_WORK. + (addressbook_search_activated): same. + (addressbook_query_changed): same. + + * gui/component/Makefile.am (libevolution_addressbook_la_LIBADD): + add libfilter.la back in. + 2002-12-09 Ettore Perazzoli <ettore@ximian.com> * gui/widgets/e-minicard-control.c: #define MINICARD_CONTROL_ID. diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index f4e11047b5..8d4fcb2471 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -53,6 +53,7 @@ libevolution_addressbook_la_LIBADD = \ $(top_builddir)/addressbook/gui/widgets/libeminicard.a \ $(top_builddir)/addressbook/printing/libecontactprint.a \ $(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a \ + $(top_builddir)/filter/libfilter.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/camel/libcamel.la \ $(top_builddir)/e-util/ename/libename.la \ @@ -65,8 +66,6 @@ libevolution_addressbook_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS) -# not done yet: -# $(top_builddir)/filter/libfilter.la libevolution_addressbook_la_LDFLAGS = -module -avoid-version diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 03f4e432cb..e8298a8d4c 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -111,12 +111,10 @@ view_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) static void search_cb (BonoboUIComponent *uih, void *user_data, const char *path) { -#ifdef PENDING_PORT_WORK AddressbookView *view = (AddressbookView *) user_data; if (view->view) gtk_widget_show(e_addressbook_search_dialog_new(view->view)); -#endif } static void @@ -835,9 +833,7 @@ addressbook_search_activated (ESearchBar *esb, AddressbookView *view) NULL); if (search_type == ESB_ADVANCED) { -#ifdef PENDING_PORT_WORK gtk_widget_show(e_addressbook_search_dialog_new(view->view)); -#endif } else { if ((search_word && strlen (search_word)) || search_type == ESB_CATEGORY) { @@ -897,9 +893,7 @@ addressbook_query_changed (ESearchBar *esb, AddressbookView *view) NULL); if (search_type == ESB_ADVANCED) { -#ifdef PENDING_PORT_WORK gtk_widget_show(e_addressbook_search_dialog_new(view->view)); -#endif } } |