diff options
Diffstat (limited to 'addressbook/gui/component')
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 3 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 6 |
2 files changed, 1 insertions, 8 deletions
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 } } |