Changes in protocols/yahoo/yahoo.c [e7f46c5:d2cbe0a]

File:

• protocols/yahoo/yahoo.c (modified) (7 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;
@@ -195 +189 @@
 {
         struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-
+        
         gc->away = NULL;
-
-        if (msg)
+        
+        if( msg )
         {
                 yd->current_status = YAHOO_STATUS_CUSTOM;
                 gc->away = "";
         }
-        else if (state)
+        if( state )
         {
                 gc->away = "";
-                if( g_strcasecmp(state, "Available" ) == 0 )
+                if( g_strcasecmp( state, "Available" ) == 0 )
                 {
                         yd->current_status = YAHOO_STATUS_AVAILABLE;
@@ -241 +235 @@
                 }
         }
-        else if ( gc->is_idle )
+        else if( gc->is_idle )
                 yd->current_status = YAHOO_STATUS_IDLE;
         else
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        yahoo_set_away( yd->y2_id, yd->current_status, msg, gc->away != NULL );
+        if( yd->current_status == YAHOO_STATUS_INVISIBLE )
+                yahoo_set_away( yd->y2_id, yd->current_status, NULL, gc->away != NULL );
+        else
+                yahoo_set_away( yd->y2_id, yd->current_status, msg, gc->away != NULL );
 }
 
@@ -396 +393 @@
 }
 
-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 +408 @@
         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 +416 @@
         ret->cmp_buddynames = g_strcasecmp;
         
-        my_protocol = ret;
+        register_protocol(ret);
 }
 
@@ -433 +430 @@
                 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 );
         }