[evolution-data-server] Bug #638089 - Some mobile phone contacts are not shown in preview

[Milan Crha <mcrha src gnome org>]

commit 3112a8fc6d7cc7fe2489ce85211e66691a053fe6
Author: Milan Crha <mcrha redhat com>
Date:   Mon Feb 14 09:44:18 2011 +0100

    Bug #638089 - Some mobile phone contacts are not shown in preview

 addressbook/libebook/e-contact.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index 27d762d..e989507 100644
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -848,8 +848,9 @@ e_contact_set_property (GObject *object,
 								else if (!found_needed2 && !g_ascii_strcasecmp ((gchar *)values->data, info->attr_type2)) {
 									found_needed2 = TRUE;
 									matches = TRUE;
-								} else {
-									matches = FALSE;
+								} else if (found_needed1) {
+									if (!matches || !found_needed2)
+										matches = FALSE;
 									break;
 								}
 
@@ -1119,8 +1120,9 @@ e_contact_find_attribute_with_types (EContact *contact, const gchar *attr_name,
 						else if (!found_needed2 && !g_ascii_strcasecmp ((gchar *)values->data, type_needed2)) {
 							found_needed2 = TRUE;
 							matches = TRUE;
-						} else {
-							matches = FALSE;
+						} else if (found_needed1) {
+							if (!matches || !found_needed2)
+								matches = FALSE;
 							break;
 						}
 						values = values->next;