Nobody should be releasing proxy objects externally; this should only be done when the AIListObject deallocates. Refs #14294
authorEvan Schoenberg
Mon, 22 Aug 2011 20:27:16 -0500
changeset 3624 375d1588ba79
parent 3623 e9876704681e
child 3625 c079feb49178
Nobody should be releasing proxy objects externally; this should only be done when the AIListObject deallocates. Refs #14294
(transplanted from 7cedf16beeab402f04d3f58cb7926218b587a172)
Frameworks/Adium Framework/Source/ESObjectWithProperties.h
Frameworks/Adium Framework/Source/ESObjectWithProperties.m
Source/AIContactController.m
--- a/Frameworks/Adium Framework/Source/ESObjectWithProperties.h	Mon Aug 22 16:26:10 2011 +0200
+++ b/Frameworks/Adium Framework/Source/ESObjectWithProperties.h	Mon Aug 22 20:27:16 2011 -0500
@@ -67,6 +67,5 @@
 
 - (NSSet *)proxyObjects;
 - (void)noteProxyObject:(id)proxyObject;
-- (void)clearProxyObjects;
 
 @end
--- a/Frameworks/Adium Framework/Source/ESObjectWithProperties.m	Mon Aug 22 16:26:10 2011 +0200
+++ b/Frameworks/Adium Framework/Source/ESObjectWithProperties.m	Mon Aug 22 20:27:16 2011 -0500
@@ -45,7 +45,7 @@
 	return self;
 }
 
-- (void)clearProxyObjects
+- (void)_clearProxyObjects
 {
 	for (AIProxyListObject *proxy in proxyObjects)
 		[AIProxyListObject releaseProxyObject:proxy];
@@ -57,7 +57,7 @@
  */
 - (void)dealloc
 {
-	[self clearProxyObjects];
+	[self _clearProxyObjects];
 
 	[propertiesDictionary release]; propertiesDictionary = nil;
 	[changedProperties release]; changedProperties = nil;
--- a/Source/AIContactController.m	Mon Aug 22 16:26:10 2011 +0200
+++ b/Source/AIContactController.m	Mon Aug 22 20:27:16 2011 -0500
@@ -1249,8 +1249,6 @@
 		[container removeObjectAfterAccountStopsTracking:inContact];
 	}
 
-	[inContact clearProxyObjects];
-
 	[contactDict removeObjectForKey:inContact.internalUniqueObjectID];
 }