Adium

Changeset 13800

Show
Ignore:
Timestamp:
10/24/2005 09:06:24 PM (3 years ago)
Author:
durin42
Message:

This patch fixes metacontacts such that MSN Display names now only show as the
away message if the preferred contact is actually the MSN contact.
Fixes #1022

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Frameworks/Adium Framework/AIMetaContact.m

    r13509 r13800  
    664664        } 
    665665         
    666         return (returnValue); 
     666        return returnValue; 
    667667} 
    668668//Sorting -------------------------------------------------------------------------------------------------------------- 
    …… 
    928928 
    929929        enumerator = [[self listContacts] objectEnumerator]; 
    930         while (!contactListStatusMessage && (listContact = [enumerator nextObject])) { 
    931                 contactListStatusMessage = [self statusObjectForKey:@"ContactListStatusMessage"]; 
    932                 if (!contactListStatusMessage) { 
    933                         contactListStatusMessage = [self statusMessage]; 
    934                 } 
    935         } 
     930        while (!contactListStatusMessage && (listContact = [enumerator nextObject])) 
     931                contactListStatusMessage = [listContact contactListStatusMessage]; 
     932        if (!contactListStatusMessage) 
     933                contactListStatusMessage = [self statusMessage]; 
     934        NSLog(@"Stage 3: %@",contactListStatusMessage); 
    936935         
    937936        return contactListStatusMessage;