[evolution] Bug #542723 - [vCard importer] Some fields get imported also into notes

[Milan Crha <mcrha src gnome org>]

commit 904a7b4e140c85cc3c9213729258884e187cef00
Author: Sebastian Fritz <fuerchter gmail com>
Date:   Tue Feb 25 12:39:51 2014 +0100

    Bug #542723 - [vCard importer] Some fields get imported also into notes

 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 807442e..8f1f4ad 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);