adium-1.4 2778:28f5eed808ff: Changes in manual ordering must be ...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/28f5eed808ff
revision:	2778:28f5eed808ff
author:		Evan Schoenberg
date:		Sat Nov 21 19:07:24 2009 -0600

Changes in manual ordering must be relative to the visible objects within a group, not all of them, or the results wrong. I'm not sure how this was ever working; I suspect that it was relying on a sorting bug elsewhere in Adium which has been fixed in 1.4. Fixes #12096
(transplanted from f1eb7d4192c6a534e0aec3f10c6890ad85bf23ff)

diffs (14 lines):

diff -r b00f7de2a5c9 -r 28f5eed808ff Frameworks/Adium Framework/Source/AIListObject.m
--- a/Frameworks/Adium Framework/Source/AIListObject.m	Sat Nov 21 16:58:09 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIListObject.m	Sat Nov 21 19:07:24 2009 -0600
@@ -220,8 +220,8 @@
 		
 	} else {
 		//Moved somewhere in the middle.  New index is the average of the next largest and smallest index
-		AIListObject	*previousObject = [container.containedObjects objectAtIndex:index-1];
-		AIListObject	*nextObject = [container.containedObjects objectAtIndex:index];
+		AIListObject	*previousObject = [container.visibleContainedObjects objectAtIndex:index-1];
+		AIListObject	*nextObject = [container.visibleContainedObjects objectAtIndex:index];
 		CGFloat nextLowest = [container orderIndexForObject:previousObject];
 		CGFloat nextHighest = [container orderIndexForObject:nextObject];