← Back to branch summary

~ubuntu-branches/ubuntu/precise/evolution/precise

« back to all changes in this revision

Viewing changes to addressbook/importers/evolution-vcard-importer.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-08-18 11:10:01 UTC
  • mfrom: (1.1.83 upstream)
  • Revision ID: james.westby@ubuntu.com-20110818111001-559uzyuqsoyj7xjg
Tags: 3.1.5-0ubuntu1
https://launchpad.net/bugs/828693
* New upstream release.
* debian/control: bump e-d-s Build-Depends to 3.1.5.
* debian/patches/03_lpi.patch: refreshed.
* debian/patches/11_remove_upstream_submit_bugreport.patch: refreshed.
* debian/patches/bogofilter_init_903b8e6.patch,
  debian/patches/evo_fbee43e_to_f4505a2.patch,
  debian/patches/spamassassin_init_4fc04af.patch: dropped, included upstream.
* debian/patches/spamd_sbin_path.patch: correct the path to spamd as
  /usr/sbin/spamd, which is the correct path in Ubuntu. (LP: #828693)

Show diffs side-by-side

added added

removed removed

Lines of Context:
addressbook/importers/evolution-vcard-importer.c
486
486
        VCardImporter *gci = user_data;
487
487
        EClient *client = NULL;
488
488
 
489
 
        if (!e_client_utils_open_new_finish (source, result, &client, NULL))
490
 
                client = NULL;
491
 
 
492
 
        gci->book_client = client ? E_BOOK_CLIENT (client) : NULL;
493
 
 
494
 
        if (gci->book_client == NULL) {
 
489
        e_client_utils_open_new_finish (source, result, &client, NULL);
 
490
 
 
491
        if (client == NULL) {
495
492
                vcard_import_done (gci);
496
493
                return;
497
494
        }
498
495
 
 
496
        gci->book_client = E_BOOK_CLIENT (client);
 
497
 
499
498
        if (gci->encoding == VCARD_ENCODING_UTF16) {
500
499
                gchar *tmp;
501
500
 
503
502
                tmp = utf16_to_utf8 (contents_utf16);
504
503
                g_free (gci->contents);
505
504
                gci->contents = tmp;
 
505
 
506
506
        } else if (gci->encoding == VCARD_ENCODING_LOCALE) {
507
507
                gchar *tmp;
508
508
                tmp = g_locale_to_utf8 (gci->contents, -1, NULL, NULL, NULL);