Changeset 703f0f7 for protocols/oscar

Timestamp:

2005-12-14T01:17:25Z (19 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:

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

protocols/oscar/oscar.c

@@ -357 +357 @@
                 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;
         }
@@ -2634 +2632 @@
 }
 
-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;
@@ -2659 +2657 @@
         ret->cmp_buddynames = aim_sncmp;
         ret->get_status_string = oscar_get_status_string;
-
         ret->send_typing = oscar_send_typing;
 
-        my_protocol = ret;
-}
+        register_protocol(ret);
+}