adium 4190:1fb2992a10d6: Patch by kbotc: "A better solution. If ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/1fb2992a10d6
revision:	4190:1fb2992a10d6
branch:		(none)
author:		Robert Vehse
date:		Tue Aug 30 22:35:21 2011 +0200

Patch by kbotc: "A better solution. If there is less than or equal to 1 chat left for the listObject, go ahead and destroy it. (We were never removing AIListObjects when they were in chats because they were considered contained by the closing chat when we were supposed to be deallocating them, thus leading to a leak)" Refs #14294.

Add kbotc to our list of developers. He should fix his commit access!

diffs (65 lines):

diff -r 255d1d2cd536 -r 1fb2992a10d6 Frameworks/Adium Framework/Source/AIChat.m
--- a/Frameworks/Adium Framework/Source/AIChat.m	Tue Aug 30 22:21:30 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIChat.m	Tue Aug 30 22:35:21 2011 +0200
@@ -705,7 +705,7 @@
 		[adium.chatController chat:self removedListContact:contact];
 
 		if (contact.isStranger &&
-			![adium.chatController allGroupChatsContainingContact:contact.parentContact].count &&
+			([adium.chatController allGroupChatsContainingContact:contact.parentContact].count <= 1) &&
 			![adium.chatController existingChatWithContact:contact.parentContact]) {
 			
 			[[AIContactObserverManager sharedManager] delayListObjectNotifications];
@@ -728,7 +728,7 @@
 	for (AIListContact *listContact in self) {
 		if (listContact.isStranger &&
 			![adium.chatController existingChatWithContact:listContact.parentContact] &&
-			([adium.chatController allGroupChatsContainingContact:listContact.parentContact].count == 0)) {
+			([adium.chatController allGroupChatsContainingContact:listContact.parentContact].count <= 1)) {
 			[adium.contactController accountDidStopTrackingContact:listContact];
 		}
 	}
diff -r 255d1d2cd536 -r 1fb2992a10d6 Plugins/Purple Service/CBPurpleAccount.m
--- a/Plugins/Purple Service/CBPurpleAccount.m	Tue Aug 30 22:21:30 2011 +0200
+++ b/Plugins/Purple Service/CBPurpleAccount.m	Tue Aug 30 22:35:21 2011 +0200
@@ -787,7 +787,7 @@
 	[chat removeObject:contact];
 	
 	if (contact.isStranger && 
-		![adium.chatController allGroupChatsContainingContact:contact.parentContact].count &&
+		([adium.chatController allGroupChatsContainingContact:contact.parentContact].count <= 1) &&
 		[adium.chatController existingChatWithContact:contact.parentContact]) {
 		// The contact is a stranger, not in any more group chats, but we have a message with them open.
 		// Set their status to unknown.
diff -r 255d1d2cd536 -r 1fb2992a10d6 Resources/Credits.rtf
--- a/Resources/Credits.rtf	Tue Aug 30 22:21:30 2011 +0200
+++ b/Resources/Credits.rtf	Tue Aug 30 22:35:21 2011 +0200
@@ -49,6 +49,10 @@
 	Stephen Holt\
 	Peter Hosey\
 	Alan Humpherys\
+\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
+
+\fs24 \cf0 	
+\fs22 Nicholas Peshek\
 	Andreas Monitzer\
 	Matthew Needham\
 	Patrick Steinhardt\
@@ -396,15 +400,9 @@
 \fs22 Mathieu "mathieuma" Masseboeuf\
 	Laura Natcher
 \fs20   (Duck Icon Variants, Crash Reporter Art)
-\b\fs28 \
-\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
+\b\fs22 \
 
-\b0\fs24 \cf0 	
-\fs22 Nicholas Peshek
-\b \
-\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
-
-\b0 \cf0 	Nick "taktile" Pisarro\
+\b0 	Nick "taktile" Pisarro\
 	Brent "berhr" Redeker\
 	Phill Ryu
 \fs24