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

File:

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

protocols/yahoo/yahoo.c

@@ -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 );
 }
 
@@ -443 +445 @@
 };
 
-void byahoo_connect_callback( gpointer data, gint source, GaimInputCondition cond )
+void byahoo_connect_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct byahoo_connect_callback_data *d = data;
@@ -465 +467 @@
 };
 
-void byahoo_read_ready_callback( gpointer data, gint source, GaimInputCondition cond )
+gboolean byahoo_read_ready_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct byahoo_read_ready_data *d = data;
         
         if( !byahoo_get_gc_by_id( d->id ) )
-        {
                 /* WTF doesn't libyahoo clean this up? */
-                ext_yahoo_remove_handler( d->id, d->tag );
-                return;
-        }
+                return FALSE;
         
         yahoo_read_ready( d->id, d->fd, d->data );
+        
+        return TRUE;
 }
 
@@ -487 +488 @@
 };
 
-void byahoo_write_ready_callback( gpointer data, gint source, GaimInputCondition cond )
+gboolean byahoo_write_ready_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct byahoo_write_ready_data *d = data;
         
         if( !byahoo_get_gc_by_id( d->id ) )
-        {
                 /* WTF doesn't libyahoo clean this up? */
-                ext_yahoo_remove_handler( d->id, d->tag );
-                return;
-        }
+                return FALSE;
         
         yahoo_write_ready( d->id, d->fd, d->data );
+        
+        return FALSE;
 }
 
@@ -687 +687 @@
                 
                 inp->d = d;
-                d->tag = inp->h = gaim_input_add( fd, GAIM_INPUT_READ, (GaimInputFunction) byahoo_read_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
         }
         else if( cond == YAHOO_INPUT_WRITE )
@@ -698 +698 @@
                 
                 inp->d = d;
-                d->tag = inp->h = gaim_input_add( fd, GAIM_INPUT_WRITE, (GaimInputFunction) byahoo_write_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
         }
         else
@@ -729 +729 @@
         }
         
-        gaim_input_remove( tag );
+        b_event_remove( tag );
 }
 
@@ -738 +738 @@
         
         d = g_new0( struct byahoo_connect_callback_data, 1 );
-        if( ( fd = proxy_connect( host, port, (GaimInputFunction) byahoo_connect_callback, (gpointer) d ) ) < 0 )
+        if( ( fd = proxy_connect( host, port, (b_event_handler) byahoo_connect_callback, (gpointer) d ) ) < 0 )
         {
                 g_free( d );