callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove PENDING_PORT_WORK. (addressbook_search_activated): same.

Browse Source 
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
This commit is contained in:
Chris Toshok
2002-12-09 21:24:20 +00:00
committed by Chris Toshok
parent 79178c27f2
commit 4f476ec48a
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
addressbook/ChangeLog
View File

@ -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.

3
addressbook/gui/component/Makefile.am
View File

@ -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

6
addressbook/gui/component/addressbook.c
View File

@ -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
}
}