Merge lp:~rodrigo-moya/ubuntuone-client/share-my-picked-contacts into lp:ubuntuone-client

[Rodrigo Moya]

Make sure we have an email address for contacts we show

Make sure we have an email address for contacts we show

[Joshua Hoover (joshuahoover)]

Tested Rodrigo's branch following the steps I outlined in the bug report and was successful.

review: Approve (ran branch and verified bug fix)

[Tim Cole (tcole)]

This has a memory leak: the list returned by e_contact_get_attributes needs to be freed by the caller. (The individual attribute objects don't -- they're still owned by the contact object.)

review: Needs Fixing

[Rodrigo Moya (rodrigo-moya)]

> This has a memory leak: the list returned by e_contact_get_attributes needs to
> be freed by the caller. (The individual attribute objects don't -- they're
> still owned by the contact object.)

right, fixed. But the individual attribute objects are also owned by the caller, so added code to free them both

[lp:~rodrigo-moya/ubuntuone-client/share-my-picked-contacts]

475. By Rodrigo Moya on 2010-04-06

Fixed memory leak

[Tim Cole (tcole)]

review: Approve

=== modified file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2010-03-25 18:09:05 +0000
+++ nautilus/contacts-view.c	2010-04-06 17:24:33 +0000
@@ -275,16 +275,32 @@
 
 	for (l = contacts; l != NULL; l = l->next) {
 		EContact *contact = l->data;
+		const gchar *email;
+		GList *emails_list, *al;
 
 		/* 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;
 
-		add_one_contact (cv,
-				 e_contact_get_const (contact, E_CONTACT_FULL_NAME),
-				 e_contact_get_const (contact, E_CONTACT_FULL_NAME),
-				 e_contact_get_const (contact, E_CONTACT_FIRST_EMAIL_ID),
-				 contact);
+		emails_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
+		for (al = emails_list; al != NULL; al = al->next) {
+			EVCardAttribute *attr = (EVCardAttribute *) al->data;
+
+			email = e_vcard_attribute_get_value (attr);
+			if (email != NULL)
+				break;
+		}
+
+		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);
+		}
+
+		g_list_foreach (emails_list, (GFunc) e_vcard_attribute_free, NULL);
+		g_list_free (emails_list);
 	}
 
 	g_signal_emit_by_name (cv, "contacts-count-changed",