Adium

Changeset 22678

Show
Ignore:
Timestamp:
02/23/2008 07:33:41 PM (9 months ago)
Author:
evands
Message:

Treat Busy as DND for XMPP. Fixes #9051

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Plugins/Purple Service/ESPurpleJabberAccount.m

    r22502 r22678  
    629629                { 
    630630                        if (([statusName isEqualToString:STATUS_NAME_DND]) || 
    631                            ([statusMessageString caseInsensitiveCompare:[[adium statusController] localizedDescriptionForCoreStatusName:STATUS_NAME_DND]] == NSOrderedSame)) 
     631                                ([statusMessageString caseInsensitiveCompare:[[adium statusController] localizedDescriptionForCoreStatusName:STATUS_NAME_DND]] == NSOrderedSame) || 
     632                                [statusName isEqualToString:STATUS_NAME_BUSY]) { 
     633                                //Note that Jabber doesn't actually support a 'busy' status; if we have it set because some other service supports it, treat it as DND 
    632634                                statusID = jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_DND); 
    633                         else if (([statusName isEqualToString:STATUS_NAME_EXTENDED_AWAY]) || 
     635 
     636                        } else if (([statusName isEqualToString:STATUS_NAME_EXTENDED_AWAY]) || 
    634637                                         ([statusMessageString caseInsensitiveCompare:[[adium statusController] localizedDescriptionForCoreStatusName:STATUS_NAME_EXTENDED_AWAY]] == NSOrderedSame)) 
    635638                                statusID = jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_XA);