Changeset 41ca004 for protocols/yahoo


Ignore:
Timestamp:
2006-05-19T07:55:53Z (15 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
68b518d6
Parents:
ac83732 (diff), 881fd4e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging from main development tree.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/yahoo/yahoo.c

    rac83732 r41ca004  
    608608        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
    609609       
    610         serv_got_update( gc, who, stat != YAHOO_STATUS_OFFLINE, 0, 0, 0,
     610        serv_got_update( gc, who, stat != YAHOO_STATUS_OFFLINE, 0, 0,
     611                         ( stat == YAHOO_STATUS_IDLE ) ? away : 0,
    611612                         ( stat != YAHOO_STATUS_AVAILABLE ) | ( stat << 1 ), 0 );
    612613}
Note: See TracChangeset for help on using the changeset viewer.