Changeset 703f0f7 for protocols/yahoo/yahoo.c

Timestamp:

2005-12-14T01:17:25Z (18 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/yahoo/yahoo.c (modified) (5 diffs)

protocols/yahoo/yahoo.c

@@ -64 +64 @@
 };
 
-static char *yahoo_name()
-{
-        return "Yahoo";
-}
-
-static struct prpl *my_protocol = NULL;
 static GSList *byahoo_inputs = NULL;
 static int byahoo_chat_id = 0;
@@ -396 +390 @@
 }
 
-void byahoo_init( struct prpl *ret )
-{
-        ret->protocol = PROTO_YAHOO;
-        ret->name = yahoo_name;
+void byahoo_init( )
+{
+        struct prpl *ret = g_new0(struct prpl, 1);
+        ret->name = "yahoo";
         
         ret->login = byahoo_login;
         ret->close = byahoo_close;
         ret->send_im = byahoo_send_im;
-        ret->send_typing = byahoo_send_typing;
         ret->get_info = byahoo_get_info;
         ret->away_states = byahoo_away_states;
@@ -412 +405 @@
         ret->remove_buddy = byahoo_remove_buddy;
         ret->get_status_string = byahoo_get_status_string;
+        ret->send_typing = byahoo_send_typing;
         
         ret->chat_send = byahoo_chat_send;
@@ -419 +413 @@
         ret->cmp_buddynames = g_strcasecmp;
         
-        my_protocol = ret;
+        register_protocol(ret);
 }
 
@@ -433 +427 @@
                 yd = gc->proto_data;
                 
-                if( gc->protocol == PROTO_YAHOO && yd->y2_id == id )
+                if( !strcmp(gc->prpl->name, "yahoo") && yd->y2_id == id )
                         return( gc );
         }