From b1565f53d797fe4dbbf7256eca060eb4d8ee9ee4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 21 Jan 2011 16:31:09 -0500 Subject: Use e_load_book_source_async() for all EBook loading. --- addressbook/importers/evolution-vcard-importer.c | 31 +++++++++--------------- 1 file changed, 12 insertions(+), 19 deletions(-) (limited to 'addressbook/importers/evolution-vcard-importer.c') diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index 1610337036..c9cc489f2b 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -44,7 +45,6 @@ #include "e-util/e-import.h" #include "e-util/e-datetime-format.h" #include "misc/e-web-view-preview.h" -#include "util/addressbook.h" #include "evolution-addressbook-importers.h" @@ -475,14 +475,13 @@ vcard_import_done (VCardImporter *gci) } static void -book_loaded_cb (EBook *book, const GError *error, gpointer closure) +book_loaded_cb (ESource *source, + GAsyncResult *result, + VCardImporter *gci) { - VCardImporter *gci = closure; + gci->book = e_load_book_source_finish (source, result, NULL); - g_return_if_fail (gci != NULL); - g_return_if_fail (gci->book == book); - - if (error) { + if (gci->book == NULL) { vcard_import_done (gci); return; } @@ -517,7 +516,7 @@ static void vcard_import (EImport *ei, EImportTarget *target, EImportImporter *im) { VCardImporter *gci; - EBook *book; + ESource *source; EImportTargetURI *s = (EImportTargetURI *)target; gchar *filename; gchar *contents; @@ -538,19 +537,10 @@ vcard_import (EImport *ei, EImportTarget *target, EImportImporter *im) return; } - book = e_book_new(g_datalist_get_data(&target->data, "vcard-source"), NULL); - if (book == NULL) { - g_message(G_STRLOC ":Couldn't create EBook."); - g_free (filename); - e_import_complete (ei, target); - return; - } - if (!g_file_get_contents (filename, &contents, NULL, NULL)) { g_message (G_STRLOC ":Couldn't read file."); g_free (filename); e_import_complete (ei, target); - g_object_unref (book); return; } @@ -559,11 +549,14 @@ vcard_import (EImport *ei, EImportTarget *target, EImportImporter *im) g_datalist_set_data(&target->data, "vcard-data", gci); gci->import = g_object_ref (ei); gci->target = target; - gci->book = book; gci->encoding = encoding; gci->contents = contents; - addressbook_load (book, book_loaded_cb, gci); + source = g_datalist_get_data (&target->data, "vcard-source"); + + e_load_book_source_async ( + source, NULL, NULL, (GAsyncReadyCallback) + book_loaded_cb, gci); } static void -- cgit v1.2.3