aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/conduit/address-conduit.c12
2 files changed, 15 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6c5f6006fd..2a35b304a7 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-25 Chris Toshok <toshok@helixcode.com>
+
+ * conduit/address-conduit.c (start_address_server): use the user's
+ Contact db. not toshok's.
+
2000-07-25 Michael Meeks <michael@helixcode.com>
* backend/ebook/load-pine-addressbook.c (book_open_cb): check we
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index d6168abb90..21d89645d8 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -145,18 +145,26 @@ static int
start_address_server (GnomePilotConduitStandardAbs *conduit,
AddressbookConduitContext *ctxt)
{
-
+ gchar *uri, *path;
+
g_return_val_if_fail(conduit!=NULL,-2);
g_return_val_if_fail(ctxt!=NULL,-2);
ctxt->ebook = e_book_new ();
- e_book_load_uri (ctxt->ebook, "file:/home/toshok/evolution/local/Contacts", book_open_cb, ctxt);
+ path = g_concat_dir_and_file (g_get_home_dir (),
+ "evolution/local/Contacts");
+ uri = g_strdup_printf ("file:%s", path);
+ g_free (path);
+
+ e_book_load_uri (ctxt->ebook, uri, book_open_cb, ctxt);
/* run a sub event loop to turn ebook's async loading into a
synchronous call */
gtk_main ();
+ g_free (uri);
+
if (ctxt->address_load_success)
return 0;