diff options
| author | Iain Holmes <iain@src.gnome.org> | 2002-08-16 21:49:37 +0800 |
|---|---|---|
| committer | Iain Holmes <iain@src.gnome.org> | 2002-08-16 21:49:37 +0800 |
| commit | bb3397f8518b459cac86533b7076543db1452dc4 (patch) | |
| tree | 457f8b8720b21683a68f006a1b40223c4ee57fd4 | |
| parent | f245eb32c54f5f98e79643338f192abea871f2cf (diff) | |
| download | gsoc2013-evolution-bb3397f8518b459cac86533b7076543db1452dc4.tar gsoc2013-evolution-bb3397f8518b459cac86533b7076543db1452dc4.tar.gz gsoc2013-evolution-bb3397f8518b459cac86533b7076543db1452dc4.tar.bz2 gsoc2013-evolution-bb3397f8518b459cac86533b7076543db1452dc4.tar.lz gsoc2013-evolution-bb3397f8518b459cac86533b7076543db1452dc4.tar.xz gsoc2013-evolution-bb3397f8518b459cac86533b7076543db1452dc4.tar.zst gsoc2013-evolution-bb3397f8518b459cac86533b7076543db1452dc4.zip | |
Import into the default book not the local one
svn path=/trunk/; revision=17788
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/backend/ebook/evolution-ldif-importer.c | 7 | ||||
| -rw-r--r-- | addressbook/backend/ebook/evolution-vcard-importer.c | 6 |
3 files changed, 19 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 3a7c7494ba..1377c572e8 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2002-08-16 Iain <iain@ximian.com> + + * backends/e-book/evolution-ldif-importer.c (ebook_create): Use the + default EBook instead of the local one. + + * backends/e-book/evolution-vcard-importer.c (ebook_create): Ditto. + 2002-08-16 Chris Toshok <toshok@ximian.com> * backend/pas/pas-backend-ldap.c (book_view_notify_status): new diff --git a/addressbook/backend/ebook/evolution-ldif-importer.c b/addressbook/backend/ebook/evolution-ldif-importer.c index 60ac899e81..d792a74172 100644 --- a/addressbook/backend/ebook/evolution-ldif-importer.c +++ b/addressbook/backend/ebook/evolution-ldif-importer.c @@ -460,7 +460,7 @@ ebook_create (LDIFImporter *gci) __FUNCTION__); return; } - +#if 0 path = g_concat_dir_and_file (g_get_home_dir (), "evolution/local/Contacts/addressbook.db"); uri = g_strdup_printf ("file://%s", path); @@ -470,6 +470,11 @@ ebook_create (LDIFImporter *gci) printf ("error calling load_uri!\n"); } g_free(uri); +#endif + + if (! e_book_load_default_book (gci->book, book_open_cb, gci)) { + g_warning ("Error calling load_default_book"); + } } /* EvolutionImporter methods */ diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c index e32593b4fb..9e0a475977 100644 --- a/addressbook/backend/ebook/evolution-vcard-importer.c +++ b/addressbook/backend/ebook/evolution-vcard-importer.c @@ -58,6 +58,7 @@ ebook_create (VCardImporter *gci) return; } +#if 0 path = g_concat_dir_and_file (g_get_home_dir (), "evolution/local"); uri = g_strdup_printf ("file://%s", path); g_free (path); @@ -71,6 +72,11 @@ ebook_create (VCardImporter *gci) printf ("error calling load_uri!\n"); } g_free(uri); +#endif + + if (! e_book_load_default_book (gci->book, book_open_cb, gci)) { + g_warning ("Error calling load_default_book"); + } } /* EvolutionImporter methods */ |