Adium

Changeset 23379

Show
Ignore:
Timestamp:
05/09/2008 01:10:06 PM (7 months ago)
Author:
evands
Message:

Further logging and a (temporary) workaround for David's problem

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Source/AdiumPreferredAccounts.m

    r23333 r23379  
    147147        } 
    148148 
     149        AILogWithSignature(@"Could not find a good choice to talk to %@; will return first available account", inContact); 
     150 
    149151        //If the previous attempts failed, or we weren't passed a contact, use the first appropriate account 
    150152        return [self firstAccountAvailableForSendingContentType:inType 

  • trunk/Source/AIContactController.m

    r23378 r23379  
    16671667                        inContact = [inContact performSelector:@selector(preferredContact)]; 
    16681668                 
    1669                 //find the best account for talking to this contact, 
     1669                //Find the best account for talking to this contact, 
    16701670                //and return an AIListContact on that account 
    16711671                account = [[adium accountController] preferredAccountForSendingContentType:inType 
    …… 
    16871687        if (!returnContact) 
    16881688                AILogWithSignature(@"Warning: (null) returnContact for sending %@ to %@", inType, inContact); 
    1689  
    1690         return returnContact; 
     1689        /* XXX We can only get a nil returnContact if preferredAccountForSendingContentType:toContact: returns nil. 
     1690         * that probably shouldn't happen. 
     1691         */ 
     1692        return (returnContact ? returnContact : inContact); 
    16911693} 
    16921694