diff options
author | Sebastian Fritz <fuerchter@gmail.com> | 2014-02-25 19:39:51 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2014-02-25 19:39:51 +0800 |
commit | 904a7b4e140c85cc3c9213729258884e187cef00 (patch) | |
tree | 5f71f9b85cabbbf26f6ac3cfd788790c5bce46d2 /addressbook | |
parent | 3a91092b4af34c9429adf92dc3af73cc3d85ddb4 (diff) | |
download | gsoc2013-evolution-904a7b4e140c85cc3c9213729258884e187cef00.tar gsoc2013-evolution-904a7b4e140c85cc3c9213729258884e187cef00.tar.gz gsoc2013-evolution-904a7b4e140c85cc3c9213729258884e187cef00.tar.bz2 gsoc2013-evolution-904a7b4e140c85cc3c9213729258884e187cef00.tar.lz gsoc2013-evolution-904a7b4e140c85cc3c9213729258884e187cef00.tar.xz gsoc2013-evolution-904a7b4e140c85cc3c9213729258884e187cef00.tar.zst gsoc2013-evolution-904a7b4e140c85cc3c9213729258884e187cef00.zip |
Bug #542723 - [vCard importer] Some fields get imported also into notes
Diffstat (limited to 'addressbook')
-rw-r--r-- | addressbook/importers/evolution-vcard-importer.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index 807442e8be..8f1f4adb60 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -75,32 +75,6 @@ typedef struct { static void vcard_import_done (VCardImporter *gci); static void -add_to_notes (EContact *contact, - EContactField field) -{ - const gchar *old_text; - const gchar *field_text; - gchar *new_text; - - old_text = e_contact_get_const (contact, E_CONTACT_NOTE); - if (old_text && strstr (old_text, e_contact_pretty_name (field))) - return; - - field_text = e_contact_get_const (contact, field); - if (!field_text || !*field_text) - return; - - new_text = g_strdup_printf ( - "%s%s%s: %s", - old_text ? old_text : "", - old_text && *old_text && - *(old_text + strlen (old_text) - 1) != '\n' ? "\n" : "", - e_contact_pretty_name (field), field_text); - e_contact_set (contact, E_CONTACT_NOTE, new_text); - g_free (new_text); -} - -static void vcard_import_contact (VCardImporter *gci, EContact *contact) { @@ -240,11 +214,6 @@ vcard_import_contact (VCardImporter *gci, } } - /* Work around the fact that these fields no longer show up in the UI */ - add_to_notes (contact, E_CONTACT_OFFICE); - add_to_notes (contact, E_CONTACT_SPOUSE); - add_to_notes (contact, E_CONTACT_BLOG_URL); - /* FIXME Error checking */ e_book_client_add_contact_sync ( gci->book_client, contact, &uid, NULL, NULL); |