[evolution-data-server/gnome-3-4] Bug #666438 - Contact's Full name field not displayed in list view

[Milan Crha <mcrha src gnome org>]

commit 75bbb937c8ba21c7e35d440d936b49eafb10540e
Author: Milan Crha <mcrha redhat com>
Date:   Fri Apr 6 15:38:49 2012 +0200

    Bug #666438 - Contact's Full name field not displayed in list view

 addressbook/libebook/e-contact.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index d49c648..5ccfca8 100644
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -520,12 +520,22 @@ static gpointer
 fn_getter (EContact *contact,
            EVCardAttribute *attr)
 {
+	/* this fills FN, if not there yet */
+	if (!attr) {
+		EContactName *name;
+
+		name = e_contact_get (contact, E_CONTACT_NAME);
+		if (name)
+			e_contact_name_free (name);
+
+		attr = e_vcard_get_attribute (E_VCARD (contact), EVC_FN);
+	}
+
 	if (attr) {
 		GList *p = e_vcard_attribute_get_values (attr);
 
 		return p && p->data ? p->data : (gpointer) "";
-	}
-	else
+	} else
 		return NULL;
 }