From: Sergio Villar Senín <svillar@igalia.com>
Date: Thu, 14 May 2009 08:53:17 +0000 (+0200)
Subject: Fixes NB#116624, do not create new contacts if they already exist when invoking ... 
X-Git-Tag: 3.0.17-rc5~7
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=06f5e97427e373347d187a59d14e8b814eda0419

Fixes NB#116624, do not create new contacts if they already exist when invoking "reply all"
---

diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c
index de88900..6234b84 100644
--- a/src/hildon2/modest-address-book.c
+++ b/src/hildon2/modest-address-book.c
@@ -671,13 +671,31 @@ select_email_addrs_for_contact(GList * email_addr_list)
 	return selected_email_addr_list;
 }
 
+/* Assumes that the second argument (the user provided one) is a pure
+   email address without name */
+static gint
+compare_addresses (const gchar *address1,
+		   const gchar *mail2)
+{
+	gint retval;
+	gchar *mail1;
+
+	mail1 = modest_text_utils_get_email_address (address1);
+	retval = g_strcmp0 (mail1, mail2);
+	g_free (mail1);
+
+	return retval;
+}
+
 static EContact *
 get_contact_for_address (GList *contacts,
 			 const gchar *address)
 {
 	EContact *retval = NULL, *contact;
 	GList *iter;
+	gchar *email;
 
+	email = modest_text_utils_get_email_address (address);
 	iter = contacts;
 	while (iter && !retval) {
 		GList *emails = NULL;
@@ -686,7 +704,7 @@ get_contact_for_address (GList *contacts,
 		emails = e_contact_get (contact, E_CONTACT_EMAIL);
 		if (emails) {
 			/* Look for the email address */
-			if (g_list_find_custom (emails, address, (GCompareFunc) g_strcmp0))
+			if (g_list_find_custom (emails, email, (GCompareFunc) compare_addresses))
 				retval = contact;
 
 			/* Free the list */
@@ -695,6 +713,8 @@ get_contact_for_address (GList *contacts,
 		}
 		iter = g_list_next (iter);
 	}
+	g_free (email);
+
 	return retval;
 }