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

File:

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