Changeset 26

Timestamp:

05/31/09 22:57:55 (15 years ago)

Author:

jon

Message:

Various updates to accommodate API changes in Adium 1.4. Now builds and runs with Adium 1.4, but no longer with 1.3.

Location:

Trunk

Files:

• ABSortByLogSizePlugin.m (modified) (1 diff)
• AILogSizeSort.m (modified) (5 diffs)

Trunk/ABSortByLogSizePlugin.m

@@ -30 +30 @@
 - (void)installPlugin
 {
-        [[adium contactController] registerListSortController:[[[AILogSizeSort alloc] init] autorelease]];
+        [AISortController registerSortController:[[[AILogSizeSort alloc] init] autorelease]];
 }
 

Trunk/AILogSizeSort.m

@@ -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)
+NSComparisonResult logSizeSort(id objectA, id objectB, BOOL groups, id<AIContainingObject> container)
 {
         if(groups)
         {
                 // Keep groups in manual order (borrowed from ESStatusSort)
-                if ([objectA orderIndex] > [objectB orderIndex])
+                if ([container orderIndexForObject:objectA] > [container orderIndexForObject:objectB])
                 {
                         return NSOrderedDescending;
@@ -289 +289 @@
         // 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;