Changeset 84b045d for protocols/yahoo


Ignore:
Timestamp:
2007-04-16T01:03:08Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
6bbb939
Parents:
c2fb3809
Message:

s/imc/imcb/ for callback functions. Moved things aroundin nogaim.h a
little bit, grouping things by category instead of original Gaim 0.58
filename.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/yahoo/yahoo.c

    rc2fb3809 r84b045d  
    123123static void byahoo_login( account_t *acc )
    124124{
    125         struct im_connection *ic = imc_new( acc );
     125        struct im_connection *ic = imcb_new( acc );
    126126        struct byahoo_data *yd = ic->proto_data = g_new0( struct byahoo_data, 1 );
    127127       
     
    129129        yd->current_status = YAHOO_STATUS_AVAILABLE;
    130130       
    131         imc_log( ic, "Connecting" );
     131        imcb_log( ic, "Connecting" );
    132132        yd->y2_id = yahoo_init( acc->user, acc->pass );
    133133        yahoo_login( yd->y2_id, yd->current_status );
     
    163163{
    164164        /* Just make an URL and let the user fetch the info */
    165         imc_log(ic, "%s\n%s: %s%s", _("User Info"),
     165        imcb_log(ic, "%s\n%s: %s%s", _("User Info"),
    166166                        _("For now, fetch yourself"), yahoo_get_profile_url(),
    167167                        who);
     
    510510        if( succ == YAHOO_LOGIN_OK )
    511511        {
    512                 imc_connected( ic );
     512                imcb_connected( ic );
    513513               
    514514                yd->logged_in = TRUE;
     
    538538               
    539539                if( url && *url )
    540                         imc_error( ic, "Error %d (%s). See %s for more information.", succ, errstr, url );
     540                        imcb_error( ic, "Error %d (%s). See %s for more information.", succ, errstr, url );
    541541                else
    542                         imc_error( ic, "Error %d (%s)", succ, errstr );
     542                        imcb_error( ic, "Error %d (%s)", succ, errstr );
    543543               
    544544                imc_logout( ic, allow_reconnect );
     
    605605        struct im_connection *ic = byahoo_get_ic_by_id( id );
    606606       
    607         imc_log( ic, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
     607        imcb_log( ic, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
    608608}
    609609
     
    625625        struct im_connection *ic = byahoo_get_ic_by_id( id );
    626626       
    627         imc_log( ic, "Yahoo! system message: %s", msg );
     627        imcb_log( ic, "Yahoo! system message: %s", msg );
    628628}
    629629
     
    632632        struct im_connection *ic = byahoo_get_ic_by_id( id );
    633633       
    634         imc_log( ic, "Got a webcam invitation from %s. IRC+webcams is a no-no though...", from );
     634        imcb_log( ic, "Got a webcam invitation from %s. IRC+webcams is a no-no though...", from );
    635635}
    636636
     
    639639        struct im_connection *ic = byahoo_get_ic_by_id( id );
    640640       
    641         imc_error( ic, "%s", err );
     641        imcb_error( ic, "%s", err );
    642642       
    643643        if( fatal )
     
    803803        g_snprintf( txt, 1024, "Got an invitation to chatroom %s from %s: %s", room, who, msg );
    804804       
    805         do_ask_dialog( ic, txt, inv, byahoo_accept_conf, byahoo_reject_conf );
     805        imcb_ask( ic, txt, inv, byahoo_accept_conf, byahoo_reject_conf );
    806806}
    807807
     
    810810        struct im_connection *ic = byahoo_get_ic_by_id( id );
    811811       
    812         imc_log( ic, "Invite to chatroom %s rejected by %s: %s", room, who, msg );
     812        imcb_log( ic, "Invite to chatroom %s rejected by %s: %s", room, who, msg );
    813813}
    814814
     
    893893       
    894894        if( from && subj )
    895                 imc_log( ic, "Received e-mail message from %s with subject `%s'", from, subj );
     895                imcb_log( ic, "Received e-mail message from %s with subject `%s'", from, subj );
    896896        else if( cnt > 0 )
    897                 imc_log( ic, "Received %d new e-mails", cnt );
     897                imcb_log( ic, "Received %d new e-mails", cnt );
    898898}
    899899
Note: See TracChangeset for help on using the changeset viewer.