Changes in protocols/oscar/oscar.c [7b23afd:9cb9868]

File:

• protocols/oscar/oscar.c (modified) (4 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;
         }
@@ -1208 +1210 @@
         return 1;
 }
-/*
-int handle_cmp_aim(const char * a, const char * b) {
-        return handle_cmp(a, b, PROTO_TOC);
-}
-*/
+
 static int gaim_parse_incoming_im(aim_session_t *sess, aim_frame_t *fr, ...) {
         int channel, ret = 0;
@@ -2465 +2463 @@
 }
 
-void oscar_init() 
-{
-        struct prpl *ret = g_new0(struct prpl, 1);
-        ret->name = "oscar";
+static struct prpl *my_protocol = NULL;
+
+void oscar_init(struct prpl *ret) {
+        ret->protocol = PROTO_OSCAR;
         ret->away_states = oscar_away_states;
         ret->login = oscar_login;
@@ -2484 +2482 @@
         ret->set_permit_deny = oscar_set_permit_deny;
         ret->keepalive = oscar_keepalive;
+        ret->cmp_buddynames = aim_sncmp;
         ret->get_status_string = oscar_get_status_string;
 
-        register_protocol(ret);
-}
+        my_protocol = ret;
+}