adium 4143:a00b7964253b: Patch from kbotc: "Following Apple's do...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/a00b7964253b
revision:	4143:a00b7964253b
branch:		(none)
author:		Robert Vehse
date:		Mon Aug 15 23:19:09 2011 +0200

Patch from kbotc: "Following Apple's documentation, we won't reload the children if they're not visible". Refs #14294.
Subject: adium 4144:683b066ed8e9: Patch from kbotc: "If you can see the object, it has to already exist". Refs #14294.

details:	http://hg.adium.im/adium/rev/683b066ed8e9
revision:	4144:683b066ed8e9
branch:		(none)
author:		Robert Vehse
date:		Mon Aug 15 23:21:51 2011 +0200

Patch from kbotc: "If you can see the object, it has to already exist". Refs #14294.

diffs (27 lines):

diff -r f570d6225e0a -r 683b066ed8e9 Source/AIListController.m
--- a/Source/AIListController.m	Sat Aug 13 21:05:24 2011 +0200
+++ b/Source/AIListController.m	Mon Aug 15 23:21:51 2011 +0200
@@ -422,8 +422,12 @@
 	if (!object || (object == (AIListObject *)contactList)) {
 		[contactListView reloadData];
 	} else {
-		for (AIProxyListObject *proxyObject in object.proxyObjects)
-			[contactListView reloadItem:proxyObject reloadChildren:YES];
+		for (AIProxyListObject *proxyObject in object.proxyObjects) {
+            if ([proxyObject.listObject isExpanded])
+                [contactListView reloadItem:proxyObject reloadChildren:YES];
+            else
+                [contactListView reloadItem:proxyObject reloadChildren:NO];
+        }
 	}
 }
 
@@ -573,7 +577,7 @@
 					/* Dragging a contact into a contact which is already within a metacontact.
 					 * This should retarget to combine the dragged contact with the metacontact.
 					 */
-					[outlineView setDropItem:[AIProxyListObject proxyListObjectForListObject:[(AIListContact *)item parentContact]
+					[outlineView setDropItem:[AIProxyListObject existingProxyListObjectForListObject:[(AIListContact *)item parentContact]
 																				inListObject:[(AIListContact *)item parentContact].containingObjects.anyObject]
 							  dropChildIndex:NSOutlineViewDropOnItemIndex];
 				}