Adium

Changeset 24152

Show
Ignore:
Timestamp:
07/01/2008 05:15:15 PM (5 months ago)
Author:
evands
Message:

Backported [23997]:
Fix the case of a metacontact which was available on connect going away causing the "come back" event to be fired. This would occur when the cache had a nil-entry and an event fires causing the cache to be updated before the meta contact is fully away, which triggers the "came back" event. Refs #468.

Backported [23990]:
Fix the world's most oddly placed bang, fixing a longstanding issue where the wrong event would fire for a contact. Fixes #468. Fixes #5551.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/adium-1.2/Source/AIContactStatusEventsPlugin.m

    r20107 r24152  
    321321 
    322322                                //Update away/not-away 
    323                                 newAwayNumber = [NSNumber numberWithBool:([inObject statusType] == AIAwayStatusType)]; 
     323                                newAwayNumber = ([inObject statusType] == AIAwayStatusType) ? [NSNumber numberWithBool:YES] : nil; 
    324324                                 
    325325                                awayChanged = [self updateCache:awayCache 
    …… 
    401401        if ((newStatus && !oldStatus) || 
    402402           (oldStatus && !newStatus) || 
    403            ((performCompare && newStatus && oldStatus && ![newStatus performSelector:@selector(compare:) withObject:oldStatus] == 0))) { 
    404                  
     403           ((performCompare && newStatus && oldStatus && [newStatus performSelector:@selector(compare:) withObject:oldStatus] != NSOrderedSame))) {              
    405404                if (newStatus) { 
    406405                        [cache setObject:newStatus forKey:[inObject internalObjectID]];