Changes in protocols/yahoo/yahoo.c [5b52a48:a36b030]

File:

• protocols/yahoo/yahoo.c (modified) (6 diffs)

protocols/yahoo/yahoo.c

@@ -121 +121 @@
 }
 
-static void byahoo_login( account_t *acc )
-{
-        struct gaim_connection *gc = new_gaim_conn( acc );
+static void byahoo_login( struct aim_user *user )
+{
+        struct gaim_connection *gc = new_gaim_conn( user );
         struct byahoo_data *yd = gc->proto_data = g_new0( struct byahoo_data, 1 );
         
@@ -130 +130 @@
         
         set_login_progress( gc, 1, "Connecting" );
-        yd->y2_id = yahoo_init( acc->user, acc->pass );
+        yd->y2_id = yahoo_init( user->username, user->password );
         yahoo_login( yd->y2_id, yd->current_status );
 }
@@ -192 +192 @@
         gc->away = NULL;
         
-        if( msg )
+        if( state && msg && g_strcasecmp( state, msg ) != 0 )
         {
                 yd->current_status = YAHOO_STATUS_CUSTOM;
                 gc->away = "";
         }
-        if( state )
-        {
+        else if( state )
+        {
+                /* Set msg to NULL since (if it isn't NULL already) it's equal
+                   to state. msg must be empty if we want to use an existing
+                   away state. */
+                msg = NULL;
+                
                 gc->away = "";
                 if( g_strcasecmp( state, "Available" ) == 0 )
@@ -235 +240 @@
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        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 );
+        yahoo_set_away( yd->y2_id, yd->current_status, msg, gc->away != NULL );
 }
 
@@ -409 +411 @@
         ret->chat_leave = byahoo_chat_leave;
         ret->chat_open = byahoo_chat_open;
-
-        ret->handle_cmp = g_strcasecmp;
+        ret->cmp_buddynames = g_strcasecmp;
         
         register_protocol(ret);
@@ -426 +427 @@
                 yd = gc->proto_data;
                 
-                if( strcmp( gc->acc->prpl->name, "yahoo" ) == 0 && yd->y2_id == id )
+                if( !strcmp(gc->prpl->name, "yahoo") && yd->y2_id == id )
                         return( gc );
         }