Changeset 703f0f7 for protocols/oscar


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/oscar/oscar.c

    r22bf64e r703f0f7  
    357357                odata->icq = TRUE;
    358358                /* this is odd but it's necessary for a proper do_import and do_export */
    359                 gc->protocol = PROTO_ICQ;
    360359                gc->password[8] = 0;
    361360        } else {
    362                 gc->protocol = PROTO_TOC;
    363361                gc->flags |= OPT_CONN_HTML;
    364362        }
     
    26342632}
    26352633
    2636 static struct prpl *my_protocol = NULL;
    2637 
    2638 void oscar_init(struct prpl *ret) {
    2639         ret->protocol = PROTO_OSCAR;
     2634void oscar_init()
     2635{
     2636        struct prpl *ret = g_new0(struct prpl, 1);
     2637        ret->name = "oscar";
    26402638        ret->away_states = oscar_away_states;
    26412639        ret->login = oscar_login;
     
    26592657        ret->cmp_buddynames = aim_sncmp;
    26602658        ret->get_status_string = oscar_get_status_string;
    2661 
    26622659        ret->send_typing = oscar_send_typing;
    26632660
    2664         my_protocol = ret;
    2665 }
     2661        register_protocol(ret);
     2662}
Note: See TracChangeset for help on using the changeset viewer.