From: Jose Dapena Paz <jdapena@igalia.com>
Date: Fri, 4 Sep 2009 11:24:10 +0000 (+0200)
Subject: Filter also with email and name structured fields (fix 2/3 NB#135191).
X-Git-Tag: 3.0.17-rc49~3
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=0cd3bbc169fe8d5a35d6d61555668244b4d04067;p=modest

Filter also with email and name structured fields (fix 2/3 NB#135191).
---

diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c
index 027aadb..806b341 100644
--- a/src/hildon2/modest-address-book.c
+++ b/src/hildon2/modest-address-book.c
@@ -906,7 +906,7 @@ get_contacts_for_name (const gchar *name)
 	GList *result;
 	gchar *unquoted;
 	GetContactsInfo *info;
-	EBookQuery *queries[8];
+	EBookQuery *queries[10];
 
 	if (name == NULL)
 		return NULL;
@@ -921,7 +921,9 @@ get_contacts_for_name (const gchar *name)
 	queries[5] = e_book_query_field_test (E_CONTACT_EMAIL_2, E_BOOK_QUERY_BEGINS_WITH, unquoted);
 	queries[6] = e_book_query_field_test (E_CONTACT_EMAIL_3, E_BOOK_QUERY_BEGINS_WITH, unquoted);
 	queries[7] = e_book_query_field_test (E_CONTACT_EMAIL_4, E_BOOK_QUERY_BEGINS_WITH, unquoted);
-	book_query = e_book_query_or (8, queries, TRUE);
+	queries[8] = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+	queries[9] = e_book_query_field_test (E_CONTACT_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+	book_query = e_book_query_or (10, queries, TRUE);
 
 	g_free (unquoted);