diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-01-24 03:59:41 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-01-30 21:37:15 +0800 |
| commit | e583928e0401a4baea4432c5b7e12a1b1eff8c2e (patch) | |
| tree | 786d3c1b3ed24456d88f3b8c6987755a08f310db /addressbook/importers | |
| parent | 5125cdac38ced3898bdd59ed29259e4c747374f7 (diff) | |
| download | gsoc2013-evolution-e583928e0401a4baea4432c5b7e12a1b1eff8c2e.tar gsoc2013-evolution-e583928e0401a4baea4432c5b7e12a1b1eff8c2e.tar.gz gsoc2013-evolution-e583928e0401a4baea4432c5b7e12a1b1eff8c2e.tar.bz2 gsoc2013-evolution-e583928e0401a4baea4432c5b7e12a1b1eff8c2e.tar.lz gsoc2013-evolution-e583928e0401a4baea4432c5b7e12a1b1eff8c2e.tar.xz gsoc2013-evolution-e583928e0401a4baea4432c5b7e12a1b1eff8c2e.tar.zst gsoc2013-evolution-e583928e0401a4baea4432c5b7e12a1b1eff8c2e.zip | |
Use e_book_client_connect().
Instead of e_client_utils_open_new() and e_book_client_new().
Diffstat (limited to 'addressbook/importers')
| -rw-r--r-- | addressbook/importers/evolution-csv-importer.c | 15 | ||||
| -rw-r--r-- | addressbook/importers/evolution-ldif-importer.c | 15 | ||||
| -rw-r--r-- | addressbook/importers/evolution-vcard-importer.c | 15 |
3 files changed, 18 insertions, 27 deletions
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index 38ba5cacbf..6d5423e064 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -871,15 +871,14 @@ csv_import_done (CSVImporter *gci) } static void -book_loaded_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) +book_client_connect_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { - ESource *source = E_SOURCE (source_object); CSVImporter *gci = user_data; - EClient *client = NULL; + EClient *client; - e_client_utils_open_new_finish (source, result, &client, NULL); + client = e_book_client_connect_finish (result, NULL); if (client == NULL) { csv_import_done (gci); @@ -928,9 +927,7 @@ csv_import (EImport *ei, source = g_datalist_get_data (&target->data, "csv-source"); - e_client_utils_open_new ( - source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, - book_loaded_cb, gci); + e_book_client_connect (source, NULL, book_client_connect_cb, gci); } static void diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 3ecde6f6f3..ae8fb5ac95 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -663,15 +663,14 @@ ldif_import_done (LDIFImporter *gci) } static void -book_loaded_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) +book_client_connect_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { - ESource *source = E_SOURCE (source_object); LDIFImporter *gci = user_data; - EClient *client = NULL; + EClient *client; - e_client_utils_open_new_finish (source, result, &client, NULL); + client = e_book_client_connect_finish (result, NULL); if (client == NULL) { ldif_import_done (gci); @@ -719,9 +718,7 @@ ldif_import (EImport *ei, source = g_datalist_get_data (&target->data, "ldif-source"); - e_client_utils_open_new ( - source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, - book_loaded_cb, gci); + e_book_client_connect (source, NULL, book_client_connect_cb, gci); } static void diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index b7ee8660ca..09778b5f21 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -491,15 +491,14 @@ vcard_import_done (VCardImporter *gci) } static void -book_loaded_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) +book_client_connect_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { - ESource *source = E_SOURCE (source_object); VCardImporter *gci = user_data; - EClient *client = NULL; + EClient *client; - e_client_utils_open_new_finish (source, result, &client, NULL); + client = e_book_client_connect_finish (result, NULL); if (client == NULL) { vcard_import_done (gci); @@ -579,9 +578,7 @@ vcard_import (EImport *ei, source = g_datalist_get_data (&target->data, "vcard-source"); - e_client_utils_open_new ( - source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, - book_loaded_cb, gci); + e_book_client_connect (source, NULL, book_client_connect_cb, gci); } static void |