Changeset 7b23afd for protocols/oscar/oscar.c

Timestamp:

2005-11-07T16:16:18Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f7f3ada

Parents:

fe51bcf

Message:

Migrate my pluginable branch to use Wilmers' branch as parent

File:

• protocols/oscar/oscar.c (modified) (3 diffs)

protocols/oscar/oscar.c

@@ -364 +364 @@
                 odata->icq = TRUE;
                 /* this is odd but it's necessary for a proper do_import and do_export */
-                gc->protocol = PROTO_ICQ;
                 gc->password[8] = 0;
         } else {
-                gc->protocol = PROTO_TOC;
                 gc->flags |= OPT_CONN_HTML;
         }
@@ -2467 +2465 @@
 }
 
-static struct prpl *my_protocol = NULL;
-
-void oscar_init(struct prpl *ret) {
-        ret->protocol = PROTO_OSCAR;
+void oscar_init() 
+{
+        struct prpl *ret = g_new0(struct prpl, 1);
+        ret->name = "oscar";
         ret->away_states = oscar_away_states;
         ret->login = oscar_login;
@@ -2488 +2486 @@
         ret->get_status_string = oscar_get_status_string;
 
-        my_protocol = ret;
-}
+        register_protocol(ret);
+}