Changeset 7389 for trunk/macosx/GroupsController.m

Timestamp:

Dec 14, 2008, 4:50:41 PM (12 years ago)

Author:

livings124

Message:

ensure auto-grouping will never be used on Tiger

File:

• trunk/macosx/GroupsController.m (modified) (4 diffs)

trunk/macosx/GroupsController.m

@@ -26 +26 @@
 #import "CTGradient.h"
 #import "NSBezierPathAdditions.h"
+#import "NSApplicationAdditions.h"
 
 #define ICON_WIDTH 16.0
@@ -203 +204 @@
 - (BOOL) usesAutoAssignRulesForIndex: (NSInteger) index
 {
+    if (![NSApp isOnLeopardOrBetter])
+        return NO;
+    
     NSInteger orderIndex = [self rowValueForIndex: index];
     if (orderIndex == -1)
@@ -453 +457 @@
     
     NSEnumerator * iterator = [[self autoAssignRulesForIndex: index] objectEnumerator];
-    NSArray * rule = nil;
+    NSArray * rule;
     while ((rule = [iterator nextObject]))
     {
@@ -467 +471 @@
         NSStringCompareOptions options;
         if ([place isEqualToString: @"begins"])
-            options = NSCaseInsensitiveSearch + NSAnchoredSearch;
+            options = NSCaseInsensitiveSearch | NSAnchoredSearch;
         else if ([place isEqualToString: @"ends"])
-            options = NSCaseInsensitiveSearch + NSBackwardsSearch + NSAnchoredSearch;
+            options = NSCaseInsensitiveSearch | NSBackwardsSearch | NSAnchoredSearch;
         else if ([place isEqualToString: @"contains"])
             options = NSCaseInsensitiveSearch;