adium-1.4 2777:b00f7de2a5c9: This complex fast enumeration was t...

commits at adium.im commits at adium.im
Sat Nov 21 21:58:12 UTC 2009


details:	http://hg.adium.im/adium-1.4/rev/b00f7de2a5c9
revision:	2777:b00f7de2a5c9
author:		Zachary West <zacw at adium.im>
date:		Sat Nov 21 16:58:09 2009 -0500

This complex fast enumeration was throwing *two* warnings.

diffs (16 lines):

diff -r 790da92cabb6 -r b00f7de2a5c9 Frameworks/Adium Framework/Source/AIAddressBookController.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookController.m	Sat Nov 21 16:57:52 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.m	Sat Nov 21 16:58:09 2009 -0500
@@ -1280,8 +1280,10 @@
 			[person setValue:[contact phoneticName] forKey:kABFirstNamePhoneticProperty];
 
 		NSString				*UID = contact.formattedUID;
-			
-		for (AIListObject *c in [contact isKindOfClass:[AIMetaContact class]] ? [(AIMetaContact *)contact uniqueContainedObjects] : [NSArray arrayWithObject:contact])	{
+		
+		NSArray *contacts = [contact isKindOfClass:[AIMetaContact class]] ? [(AIMetaContact *)contact uniqueContainedObjects] : [NSArray arrayWithObject:contact];
+		
+		for (AIListObject *c in contacts) {
 			ABMutableMultiValue *multiValue = [[ABMutableMultiValue alloc] init];
 			UID = c.formattedUID;
 			serviceProperty = [AIAddressBookController propertyFromService:c.service];




More information about the commits mailing list