adium 5088:2f86166a0e51: Backed out changeset 9178c6fa3e1e
commits at adium.im
commits at adium.im
Tue Sep 18 18:43:58 UTC 2012
details: http://hg.adium.im/adium/rev/2f86166a0e51
revision: 5088:2f86166a0e51
branch: adium-1.5.4
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Tue Sep 18 20:43:09 2012 +0200
Backed out changeset 9178c6fa3e1e
CFM pointed out that this is not without consequences. Lets not risk this for 1.5.4.
diffs (36 lines):
diff -r 9178c6fa3e1e -r 2f86166a0e51 Frameworks/Adium Framework/Source/AIChat.m
--- a/Frameworks/Adium Framework/Source/AIChat.m Tue Sep 18 12:38:50 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIChat.m Tue Sep 18 20:43:09 2012 +0200
@@ -1069,7 +1069,7 @@
- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(NSUInteger)len
{
- return [participatingContacts countByEnumeratingWithState:state objects:stackbuf count:len];
+ return [self.containedObjects countByEnumeratingWithState:state objects:stackbuf count:len];
}
- (BOOL) canContainObject:(id)obj
diff -r 9178c6fa3e1e -r 2f86166a0e51 Frameworks/Adium Framework/Source/AIListGroup.m
--- a/Frameworks/Adium Framework/Source/AIListGroup.m Tue Sep 18 12:38:50 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIListGroup.m Tue Sep 18 20:43:09 2012 +0200
@@ -360,7 +360,7 @@
- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(NSUInteger)len
{
- return [_containedObjects countByEnumeratingWithState:state objects:stackbuf count:len];
+ return [self.containedObjects countByEnumeratingWithState:state objects:stackbuf count:len];
}
#pragma mark Applescript
diff -r 9178c6fa3e1e -r 2f86166a0e51 Frameworks/Adium Framework/Source/AIMetaContact.m
--- a/Frameworks/Adium Framework/Source/AIMetaContact.m Tue Sep 18 12:38:50 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIMetaContact.m Tue Sep 18 20:43:09 2012 +0200
@@ -1038,7 +1038,7 @@
- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(NSUInteger)len
{
- return [_containedObjects countByEnumeratingWithState:state objects:stackbuf count:len];
+ return [self.containedObjects countByEnumeratingWithState:state objects:stackbuf count:len];
}
#pragma mark Contained Contact sorting
More information about the commits
mailing list