diff options
| -rw-r--r-- | addressbook/ChangeLog | 4 | ||||
| -rw-r--r-- | addressbook/conduit/Makefile.am | 20 | ||||
| -rw-r--r-- | addressbook/conduit/address-conduit.c | 2 |
3 files changed, 15 insertions, 11 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 26ffeff849..956018684e 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,7 @@ +2001-01-22 JP Rosevear <jpr@ximian.com> + + * conduit/Makefile.am: remove vfs dependency + 2001-01-21 JP Rosevear <jpr@ximian.com> * conduit/address-conduit.c (delete_record): Remove diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am index 4ececc9a53..99373e85e3 100644 --- a/addressbook/conduit/Makefile.am +++ b/addressbook/conduit/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = \ -I$(top_srcdir)/addressbook \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/e-util \ - $(BONOBO_VFS_GNOME_CFLAGS) \ + $(BONOBO_GNOME_CFLAGS) \ $(PISOCK_INCLUDEDIR) \ $(GNOME_PILOT_CFLAGS) @@ -12,15 +12,15 @@ bin_PROGRAMS = e-address-conduit-control-applet e_address_conduit_control_applet_SOURCES = address-conduit-control-applet.c -e_address_conduit_control_applet_LDADD = \ - $(CAPPLET_LIBS) \ - $(GNOME_LIBDIR) \ - $(GNOME_PILOT_LIBS) \ +e_address_conduit_control_applet_LDADD = \ + $(CAPPLET_LIBS) \ + $(GNOME_LIBDIR) \ + $(GNOME_PILOT_LIBS) \ $(PISOCK_LIBDIR) $(PISOCK_LIBS) \ - $(GNOME_CAPPLET_LIBS) \ - $(BONOBO_VFS_GNOME_LIBS) \ - $(GNOME_XML_LIB) \ - $(GNOMEUI_LIBS) \ + $(GNOME_CAPPLET_LIBS) \ + $(BONOBO_GNOME_LIBS) \ + $(GNOME_XML_LIB) \ + $(GNOMEUI_LIBS) \ $(INTLLIBS) @@ -42,7 +42,7 @@ libeaddress_conduit_la_LIBADD = \ $(top_builddir)/e-util/libeconduit-static.la \ $(GNOME_PILOT_LIBS) \ $(PISOCK_LIBDIR) $(PISOCK_LIBS) \ - $(BONOBO_VFS_GNOME_LIBS) \ + $(BONOBO_GNOME_LIBS) \ $(EXTRA_GNOME_LIBS) \ $(GNOME_LIBDIR) \ $(GNOME_LIBS) diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index aea9809732..47a066970e 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -580,7 +580,7 @@ card_changed (EBookView *book_view, const GList *cards, EAddrConduitContext *ctx ctxt->changed = g_list_prepend (ctxt->changed, coc); if (!e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (coc->card))) g_hash_table_insert (ctxt->changed_hash, e_card_get_id (coc->card), coc); - } + } } |