Changes in Trunk/AILogSizeSort.m [19:28]

Files:

• Trunk/AILogSizeSort.m (modified) (7 diffs)

Trunk/AILogSizeSort.m

@@ -20 +20 @@
  */
 
-#import "AILogSizeSort.h"
-#import "AILoggerPlugin.h"
-
+#import <Adium/AIPlugin.h>
 #import <Adium/AISharedAdium.h>
 
-#import <AIUtilities/AITigerCompatibility.h> 
 #import <AIUtilities/AIStringUtilities.h>
 
@@ -38 +35 @@
 #import <Adium/AIContentMessage.h>
 
+#import "AILogSizeSort.h"
+#import "AILoggerPlugin.h"
+
 @implementation AILogSizeSort
 
@@ -52 +52 @@
         
         // Listen for content addition notifications
-        [[adium notificationCenter] addObserver:self 
-                                                                   selector:@selector(contentObjectAdded:) 
-                                                                           name:Content_ContentObjectAdded 
-                                                                         object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self 
+                                                                                         selector:@selector(contentObjectAdded:) 
+                                                                                                 name:Content_ContentObjectAdded 
+                                                                                           object:nil];
 }
 
@@ -160 +160 @@
                 id contact;
                 
-                NSEnumerator *contactEnumerator = [[(AIMetaContact *)listContact listContacts] objectEnumerator];
+                NSEnumerator *contactEnumerator = [[(AIMetaContact *)listContact uniqueContainedObjects] objectEnumerator];
                 
                 while(contact = [contactEnumerator nextObject])
@@ -229 +229 @@
                 unsigned long long size = 0;
                 
-                NSEnumerator *contactEnumerator = [[(AIMetaContact *)listContact listContacts] objectEnumerator];
+                NSEnumerator *contactEnumerator = [[(AIMetaContact *)listContact uniqueContainedObjects] objectEnumerator];
 
                 while(contact = [contactEnumerator nextObject])
@@ -272 +272 @@
  * @brief Sort by log size
  */
-int logSizeSort(id objectA, id objectB, BOOL groups)
-{
-        if(groups)
+NSComparisonResult logSizeSort(id objectA, id objectB, BOOL groups, id<AIContainingObject> container)
+{
+        // Borrowed from AISortController.m
+        BOOL objectAIsGroup = [objectA isKindOfClass:[AIListGroup class]];
+        BOOL objectBIsGroup = [objectB isKindOfClass:[AIListGroup class]];
+        
+        if(groups || (objectAIsGroup && objectBIsGroup))
         {
                 // Keep groups in manual order (borrowed from ESStatusSort)
-                if ([objectA orderIndex] > [objectB orderIndex])
+                if ([container orderIndexForObject:objectA] > [container orderIndexForObject:objectB])
                 {
                         return NSOrderedDescending;
@@ -285 +289 @@
                         return NSOrderedAscending;
                 }
+        }
+        
+        // Catch cases where only one of the objects is a group
+        if(objectAIsGroup && !objectBIsGroup)
+        {
+                return NSOrderedAscending;
+        }
+        else if(!objectAIsGroup && objectBIsGroup)
+        {
+                return NSOrderedDescending;
         }
         
         // Get a reference to one and only AILogSizeSort instance.  If this sorting method is being
         // called, it should always be the case that AILogSizeSort is the active sort controller.
-        AISortController *sortController = [[adium contactController] activeSortController];
+        AISortController *sortController = [AISortController activeSortController];
         
         unsigned long long sizeA = 0;