diff options
Diffstat (limited to 'addressbook/conduit')
| -rw-r--r-- | addressbook/conduit/Makefile.am | 5 | ||||
| -rw-r--r-- | addressbook/conduit/address-conduit.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am index 01c37f4a30..056045001f 100644 --- a/addressbook/conduit/Makefile.am +++ b/addressbook/conduit/Makefile.am @@ -42,8 +42,9 @@ libaddress_conduit_la_LDFLAGS = \ -rpath $(libdir) libaddress_conduit_la_LIBADD = \ - $(top_builddir)/calendar/cal-client/libcal-client-static.la \ - $(top_builddir)/calendar/cal-util/libcal-util-static.la \ + $(top_builddir)/addressbook/backend/ebook/libebook-static.la \ + $(top_builddir)/e-util/libeutil-static.la \ + $(top_builddir)/addressbook/ename/libename-static.la \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/libical/src/libical/libical-static.la \ $(BONOBO_VFS_GNOME_LIBS) \ diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 3c6ccf573b..d6168abb90 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -69,7 +69,7 @@ conduit_destroy_configuration(AddressbookConduitCfg **c) { g_return_if_fail(c!=NULL); g_return_if_fail(*c!=NULL); - g_free(*c); + //g_free(*c); FIX ME *c = NULL; } @@ -898,7 +898,9 @@ conduit_get_gpilot_conduit (guint32 pilotId) printf ("in address's conduit_get_gpilot_conduit\n"); - retval = gnome_pilot_conduit_standard_abs_new ("AddressDB", 0x746F646F); + retval = gnome_pilot_conduit_standard_abs_new ("AddressDB", + 0x61646472); + g_assert (retval != NULL); gnome_pilot_conduit_construct(GNOME_PILOT_CONDUIT(retval),"AddressConduit"); |