adium 2322:e481c12b8726: Similar to when groups are disabled, de...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/e481c12b8726
revision:	2322:e481c12b8726
author:		Zachary West <zacw at adium.im>
date:		Mon May 25 16:22:28 2009 -0400

Similar to when groups are disabled, delete from all locations when deleting from the offline group. Fixes #12209.

diffstat:

 ChangeLogs/Changes Between Betas.txt              |  2 +-
 Frameworks/Adium Framework/Source/AIListContact.m |  3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 73308817d05d -r e481c12b8726 ChangeLogs/Changes Between Betas.txt
--- a/ChangeLogs/Changes Between Betas.txt	Mon May 25 10:47:32 2009 -0700
+++ b/ChangeLogs/Changes Between Betas.txt	Mon May 25 16:22:28 2009 -0400
@@ -5,7 +5,7 @@
  * Status icon packs can now specify "Idle And Away" icons to use for contacts. (#872)
  * Changed the status icon for group chats to be Available when joined, and Offline when parted. (#12064)
  * Fixed dragging and dropping emoticon packs to reorder them. (#12099)
- * Fixed removing contacts when groups are disabled. (#12136?)
+ * Fixed removing contacts when groups are disabled or the contact is in the offline group. (#12136?)
  * Fixed the voiceover for certain fields in the authorization requests window.
  * Fixed idle time not being reported.
  * Fixed the stepper values in the Status preferences and Status Edit window always starting at 10. (#12188)
diff -r 73308817d05d -r e481c12b8726 Frameworks/Adium Framework/Source/AIListContact.m
--- a/Frameworks/Adium Framework/Source/AIListContact.m	Mon May 25 10:47:32 2009 -0700
+++ b/Frameworks/Adium Framework/Source/AIListContact.m	Mon May 25 16:22:28 2009 -0400
@@ -724,7 +724,8 @@
 - (void)removeFromGroup:(AIListObject <AIContainingObject> *)group
 {
 	if (self.account.online) {
-		if (group == adium.contactController.contactList) {
+		if (group == adium.contactController.contactList
+			|| group == adium.contactController.offlineGroup) {
 			[self.account removeContacts:[NSArray arrayWithObject:self]
 							  fromGroups:[self.remoteGroups allObjects]];	
 		} else {