adium 2191:28d1b897634b: Don't move "always visible" contacts to...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/28d1b897634b
revision:	2191:28d1b897634b
author:		Zachary West <zacw at adium.im>
date:		Fri May 15 20:27:02 2009 -0400

Don't move "always visible" contacts to the offline group if it's enabled.

diffstat:

 Frameworks/Adium Framework/Source/AIListContact.m |  9 ++++++++-
 Frameworks/Adium Framework/Source/AIMetaContact.m |  2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r bff527c38f2d -r 28d1b897634b Frameworks/Adium Framework/Source/AIListContact.m
--- a/Frameworks/Adium Framework/Source/AIListContact.m	Thu May 14 20:48:55 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIListContact.m	Fri May 15 20:27:02 2009 -0400
@@ -202,7 +202,7 @@
 		
 		if (!adium.contactController.useContactListGroups)
 			localGroup = adium.contactController.contactList;
-		else if (adium.contactController.useOfflineGroup && !self.online)
+		else if (adium.contactController.useOfflineGroup && !self.online && !self.alwaysVisible)
 			localGroup = adium.contactController.offlineGroup;
 		
 		[groups addObject:localGroup];
@@ -619,6 +619,13 @@
 	return pref;
 }
 
+- (void)setAlwaysVisible:(BOOL)inVisible
+{
+	[super setAlwaysVisible:inVisible];
+	
+	[self restoreGrouping];
+}
+
 - (BOOL)alwaysVisible
 {
 	if (self.metaContact) {
diff -r bff527c38f2d -r 28d1b897634b Frameworks/Adium Framework/Source/AIMetaContact.m
--- a/Frameworks/Adium Framework/Source/AIMetaContact.m	Thu May 14 20:48:55 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIMetaContact.m	Fri May 15 20:27:02 2009 -0400
@@ -141,7 +141,7 @@
 	NSMutableSet *targetGroups = [NSMutableSet set];
 
 	if (adium.contactController.useContactListGroups) {
-		if (!self.online && adium.contactController.useOfflineGroup)
+		if (adium.contactController.useOfflineGroup && !self.online && !self.alwaysVisible)
 			[targetGroups addObject:adium.contactController.offlineGroup];
 		else {
 			for (AIListContact *containedContact in self.uniqueContainedObjects) {