diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-07-01 12:07:26 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-08-13 23:27:51 +0800 |
commit | f59681796df8fe0138a1754abbe8ec781bc1535e (patch) | |
tree | 0ced0c119ffed095713d7f64732686df9b2d9152 /addressbook/importers/evolution-vcard-importer.c | |
parent | bf4a1a13e3295deefc4031a446627ff9b1c95c7a (diff) | |
download | gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.gz gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.zst gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.zip |
Coding style and whitespace cleanup.
Diffstat (limited to 'addressbook/importers/evolution-vcard-importer.c')
-rw-r--r-- | addressbook/importers/evolution-vcard-importer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index 09ad3d1f7f..59168d883b 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -486,16 +486,15 @@ book_loaded_cb (GObject *source_object, VCardImporter *gci = user_data; EClient *client = NULL; - if (!e_client_utils_open_new_finish (source, result, &client, NULL)) - client = NULL; + e_client_utils_open_new_finish (source, result, &client, NULL); - gci->book_client = client ? E_BOOK_CLIENT (client) : NULL; - - if (gci->book_client == NULL) { + if (client == NULL) { vcard_import_done (gci); return; } + gci->book_client = E_BOOK_CLIENT (client); + if (gci->encoding == VCARD_ENCODING_UTF16) { gchar *tmp; @@ -503,6 +502,7 @@ book_loaded_cb (GObject *source_object, tmp = utf16_to_utf8 (contents_utf16); g_free (gci->contents); gci->contents = tmp; + } else if (gci->encoding == VCARD_ENCODING_LOCALE) { gchar *tmp; tmp = g_locale_to_utf8 (gci->contents, -1, NULL, NULL, NULL); |