[Adium-commits] adium 1963:c39b835b9400: Consider "always visible" after a searc...

[adium-commits at adiumx.com]

details:	http://hg.adiumx.com/adium/rev/c39b835b9400
revision:	1963:c39b835b9400
author:		Zachary West <zacw at adiumx.com>
date:		Fri Apr 24 16:36:44 2009 -0400

Consider "always visible" after a search check, not before.

diffstat:

 Frameworks/Adium Framework/Source/AIContactHidingController.m |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r 03f8cce32c58 -r c39b835b9400 Frameworks/Adium Framework/Source/AIContactHidingController.m
--- a/Frameworks/Adium Framework/Source/AIContactHidingController.m	Fri Apr 24 16:19:45 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIContactHidingController.m	Fri Apr 24 16:36:44 2009 -0400
@@ -135,10 +135,6 @@
 	if (![container containsObject:listObject])
 		return NO;
 	
-	// Don't do any processing for a contact that's always visible.
-	if (listObject.alwaysVisible)
-		return YES;
-	
 	if ([listObject conformsToProtocol:@protocol(AIContainingObject)]) {
 		// A meta contact must meet the criteria for a contact to be visible and also have at least 1 contained contact
 		return ([(id<AIContainingObject>)listObject visibleCount] > 0 || ([listObject boolValueForProperty:@"New Object"] &&
@@ -152,6 +148,10 @@
 		return [self evaluatePredicateOnListObject:listObject withSearchString:searchString];
 	}
 	
+	// Don't do any processing for a contact that's always visible.
+	if (listObject.alwaysVisible)
+		return YES;
+	
 	if ([listObject isKindOfClass:[AIListBookmark class]])
 		return ((AIListBookmark *)listObject).account.online;