Changeset 703f0f7 for protocols/yahoo


Ignore:
Timestamp:
2005-12-14T01:17:25Z (16 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
547f937
Parents:
22bf64e (diff), 568aaf7 (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:

Merge my pluginable branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/yahoo/yahoo.c

    r22bf64e r703f0f7  
    6464};
    6565
    66 static char *yahoo_name()
    67 {
    68         return "Yahoo";
    69 }
    70 
    71 static struct prpl *my_protocol = NULL;
    7266static GSList *byahoo_inputs = NULL;
    7367static int byahoo_chat_id = 0;
     
    396390}
    397391
    398 void byahoo_init( struct prpl *ret )
    399 {
    400         ret->protocol = PROTO_YAHOO;
    401         ret->name = yahoo_name;
     392void byahoo_init( )
     393{
     394        struct prpl *ret = g_new0(struct prpl, 1);
     395        ret->name = "yahoo";
    402396       
    403397        ret->login = byahoo_login;
    404398        ret->close = byahoo_close;
    405399        ret->send_im = byahoo_send_im;
    406         ret->send_typing = byahoo_send_typing;
    407400        ret->get_info = byahoo_get_info;
    408401        ret->away_states = byahoo_away_states;
     
    412405        ret->remove_buddy = byahoo_remove_buddy;
    413406        ret->get_status_string = byahoo_get_status_string;
     407        ret->send_typing = byahoo_send_typing;
    414408       
    415409        ret->chat_send = byahoo_chat_send;
     
    419413        ret->cmp_buddynames = g_strcasecmp;
    420414       
    421         my_protocol = ret;
     415        register_protocol(ret);
    422416}
    423417
     
    433427                yd = gc->proto_data;
    434428               
    435                 if( gc->protocol == PROTO_YAHOO && yd->y2_id == id )
     429                if( !strcmp(gc->prpl->name, "yahoo") && yd->y2_id == id )
    436430                        return( gc );
    437431        }
Note: See TracChangeset for help on using the changeset viewer.