Adium

Changeset 25624

Show
Ignore:
Timestamp:
11/24/2008 10:11:50 PM (2 months ago)
Author:
rgov
Message:

Patch from Catfish_Man to remove an AIListObject from its containers when we pass nil to setContainingObject:

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Frameworks/Adium Framework/Source/AIListObject.m

    r25622 r25624  
    221221        if (![containingObjects containsObject:inGroup]) { 
    222222                //XXX multiple containers 
    223                 AIListObject<AIContainingObject> *container = self.containingObject; 
    224                 if(container) 
    225                         [containingObjects removeObject:container]; 
    226                 [containingObjects addObject:inGroup]; 
    227  
     223                if(!inGroup) { 
     224                        [containingObjects removeAllObjects]; 
     225                } else { 
     226                        AIListObject<AIContainingObject> *container = self.containingObject; 
     227                        if(container) 
     228                                [containingObjects removeObject:container]; 
     229                        [containingObjects addObject:inGroup]; 
     230                } 
     231                 
    228232                //Reset then redetermine our order index         
    229233                orderIndex = 0;