Merge lp:~chipaca/ubuntuone-client/no-null-hash-lookup into lp:ubuntuone-client

[John Lenton]

Use email address as name if there is no name for the contact

Use email address as name if there is no name for the contact

This is rodrigo's branch, with a fix for an issue found by Roman.

[dobey (dobey)]

review: Approve

[Roman Yepishev (rye)]

review: Approve

=== modified file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2010-04-16 11:52:46 +0000
+++ nautilus/contacts-view.c	2010-04-19 19:51:18 +0000
@@ -315,10 +315,12 @@
 		EContact *contact = l->data;
 		const gchar *email = NULL;
 		GList *emails_list, *al;
+		EContactName *contact_name;
+		gchar *full_name = NULL;
 
-		/* We add the selected items when searching, so ignore them here */
-		if (g_hash_table_lookup (selection_hash, (gconstpointer) e_contact_get_const (contact, E_CONTACT_FULL_NAME)))
-			continue;
+		contact_name = (EContactName *) e_contact_get (contact, E_CONTACT_NAME);
+		if (contact_name != NULL)
+			full_name = e_contact_name_to_string (contact_name);
 
 		emails_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
 		for (al = emails_list; al != NULL; al = al->next) {
@@ -329,17 +331,28 @@
 				break;
 		}
 
+		if (full_name == NULL) {
+			if (email != NULL)
+				full_name = g_strdup (email);
+			else {
+				g_warning ("Contact without name or email addresses");
+				continue;
+			}
+		}
+
+		/* We add the selected items when searching, so ignore them here */
+		if (g_hash_table_lookup (selection_hash, (gconstpointer) full_name))
+			continue;
+
 		if (email != NULL) {
-			add_one_contact (cv,
-					 e_contact_get_const (contact, E_CONTACT_FULL_NAME),
-					 e_contact_get_const (contact, E_CONTACT_FULL_NAME),
-					 email,
-					 contact);
+			add_one_contact (cv, full_name, full_name, email, contact);
 			cv->matched_contacts += 1;
 		}
 
 		g_list_foreach (emails_list, (GFunc) e_vcard_attribute_free, NULL);
 		g_list_free (emails_list);
+		e_contact_name_free (contact_name);
+		g_free (full_name);
 	}
 
 	g_signal_emit_by_name (cv, "contacts-count-changed",