adium 5190:28f09454d13a: Fix the NSFastEnumeration access to the...

commits at adium.im commits at adium.im
Tue Oct 23 22:52:50 UTC 2012


details:	http://hg.adium.im/adium/rev/28f09454d13a
revision:	5190:28f09454d13a
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Wed Oct 24 00:51:42 2012 +0200

Fix the NSFastEnumeration access to these properties to be direct, so ARC doesn't clean them up.

diffs (36 lines):

diff -r b2c1df4fa0ef -r 28f09454d13a Frameworks/Adium Framework/Source/AIGroupChat.m
--- a/Frameworks/Adium Framework/Source/AIGroupChat.m	Tue Oct 23 22:42:28 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIGroupChat.m	Wed Oct 24 00:51:42 2012 +0200
@@ -449,7 +449,7 @@
 
 - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(__unsafe_unretained id [])stackbuf count:(NSUInteger)len
 {
-	return [self.containedObjects countByEnumeratingWithState:state objects:stackbuf count:len];
+	return [participatingContacts countByEnumeratingWithState:state objects:stackbuf count:len];
 }
 
 - (BOOL) canContainObject:(id)obj
diff -r b2c1df4fa0ef -r 28f09454d13a Frameworks/Adium Framework/Source/AIListGroup.m
--- a/Frameworks/Adium Framework/Source/AIListGroup.m	Tue Oct 23 22:42:28 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIListGroup.m	Wed Oct 24 00:51:42 2012 +0200
@@ -348,7 +348,7 @@
 
 - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(__unsafe_unretained id [])stackbuf count:(NSUInteger)len
 {
-	return [self.containedObjects countByEnumeratingWithState:state objects:stackbuf count:len];
+	return [_containedObjects countByEnumeratingWithState:state objects:stackbuf count:len];
 }
 
 #pragma mark Applescript
diff -r b2c1df4fa0ef -r 28f09454d13a Frameworks/Adium Framework/Source/AIMetaContact.m
--- a/Frameworks/Adium Framework/Source/AIMetaContact.m	Tue Oct 23 22:42:28 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIMetaContact.m	Wed Oct 24 00:51:42 2012 +0200
@@ -1027,7 +1027,7 @@
 
 - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(__unsafe_unretained id [])stackbuf count:(NSUInteger)len
 {
-	return [self.containedObjects countByEnumeratingWithState:state objects:stackbuf count:len];
+	return [_containedObjects countByEnumeratingWithState:state objects:stackbuf count:len];
 }
 
 #pragma mark Contained Contact sorting




More information about the commits mailing list