From: Sergio Villar Senín <svillar@igalia.com>
Date: Wed, 13 May 2009 12:16:30 +0000 (+0200)
Subject: Fixes NB#116483, user name incorrectly prefilled when there is no Me Card
X-Git-Tag: 3.0.17-rc5~11
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=b6a3f7552283111d949d41f231cdf5b86e2e4469

Fixes NB#116483, user name incorrectly prefilled when there is no Me Card
---

diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c
index b90d7f1..de88900 100644
--- a/src/hildon2/modest-address-book.c
+++ b/src/hildon2/modest-address-book.c
@@ -1336,5 +1336,11 @@ modest_address_book_get_my_name ()
 {
 	OssoABookSelfContact *self_contact = osso_abook_self_contact_get_default ();
 
-	return osso_abook_contact_get_display_name (OSSO_ABOOK_CONTACT (self_contact));
+	/* We are not using osso_abook_contact_get_display_name
+	   because that method fallbacks to another fields if the name
+	   is not defined */
+	if (self_contact)
+		return e_contact_get ((EContact *) self_contact, E_CONTACT_NAME);
+	else
+		return NULL;
 }