From d1e9d52b19a7cc798491b44b30ee3ccfaf5fb41b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 3 Dec 2010 19:01:31 +0100 Subject: Bug #635755 - Authenticate books in addressbook importers on open --- addressbook/importers/evolution-csv-importer.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'addressbook/importers/evolution-csv-importer.c') diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index 970ada7fd6..9e15a58dee 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -37,6 +37,7 @@ #include #include "e-util/e-import.h" +#include "util/addressbook.h" #include "evolution-addressbook-importers.h" @@ -826,6 +827,20 @@ csv_import_done (CSVImporter *gci) g_free (gci); } +static void +book_loaded_cb (EBook *book, const GError *error, gpointer closure) +{ + CSVImporter *gci = closure; + + g_return_if_fail (gci != NULL); + g_return_if_fail (gci->book == book); + + if (error) + csv_import_done (gci); + else + gci->idle_id = g_idle_add (csv_import_contacts, gci); +} + static void csv_import (EImport *ei, EImportTarget *target, EImportImporter *im) { @@ -870,9 +885,7 @@ csv_import (EImport *ei, EImportTarget *target, EImportImporter *im) gci->size = ftell (file); fseek (file, 0, SEEK_SET); - e_book_open (gci->book, FALSE, NULL); - - gci->idle_id = g_idle_add (csv_import_contacts, gci); + addressbook_load (gci->book, book_loaded_cb, gci); } static void -- cgit v1.2.3