evolution-data-server r9380 - in trunk/addressbook: . libebook

[mcrha svn gnome org]

Author: mcrha
Date: Mon Aug 18 15:23:54 2008
New Revision: 9380
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9380&view=rev

Log:
2008-08-18  Milan Crha  <mcrha redhat com>

	** Fix for bug #547223 (Patch by Matt Davey)

	* libebook/e-contact.c: (e_contact_set_property),
	(e_contact_find_attribute_with_types): Check complete list of
	values in a parameter when looking for some particular value.



Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/libebook/e-contact.c

Modified: trunk/addressbook/libebook/e-contact.c
==============================================================================
--- trunk/addressbook/libebook/e-contact.c	(original)
+++ trunk/addressbook/libebook/e-contact.c	Mon Aug 18 15:23:54 2008
@@ -860,6 +860,9 @@
 								else if (!found_needed2 && !g_ascii_strcasecmp ((char*)values->data, info->attr_type2)) {
 									found_needed2 = TRUE;
 									matches = TRUE;
+								} else {
+									matches = FALSE;
+									break;
 								}
 
 								values = values->next;
@@ -1129,6 +1132,9 @@
 						else if (!found_needed2 && !g_ascii_strcasecmp ((char*)values->data, type_needed2)) {
 							found_needed2 = TRUE;
 							matches = TRUE;
+						} else {
+							matches = FALSE;
+							break;
 						}
 						values = values->next;
 					}