aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-01-24 03:59:41 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-01-30 21:37:15 +0800
commite583928e0401a4baea4432c5b7e12a1b1eff8c2e (patch)
tree786d3c1b3ed24456d88f3b8c6987755a08f310db /mail
parent5125cdac38ced3898bdd59ed29259e4c747374f7 (diff)
downloadgsoc2013-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 'mail')
-rw-r--r--mail/importers/pine-importer.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index f0e33eae06..c37d3bd809 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -174,7 +174,7 @@ import_contacts (void)
{
EShell *shell;
ESourceRegistry *registry;
- EBookClient *book_client = NULL;
+ EClient *client = NULL;
GList *list;
gchar *name;
GString *line;
@@ -201,14 +201,11 @@ import_contacts (void)
ESource *source;
source = E_SOURCE (list->data);
- book_client = e_book_client_new (source, &error);
+ client = e_book_client_connect_sync (source, NULL, &error);
}
g_list_free_full (list, (GDestroyNotify) g_object_unref);
- if (book_client != NULL)
- e_client_open_sync (E_CLIENT (book_client), TRUE, NULL, &error);
-
if (error != NULL) {
g_warning (
"%s: Failed to open book client: %s",
@@ -235,13 +232,13 @@ import_contacts (void)
g_string_truncate (line, len);
}
- import_contact (book_client, line->str);
+ import_contact (E_BOOK_CLIENT (client), line->str);
offset = 0;
}
g_string_free (line, TRUE);
fclose (fp);
- g_object_unref (book_client);
+ g_object_unref (client);
}
static gchar *