Changeset b72caac for protocols/yahoo/yahoo.c

Timestamp:

2006-06-21T16:34:33Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

59f5c42a

Parents:

3af70b0 (diff), df417ca (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:

Merging libevent branch: Events can now be handles by both glib and libevent.

File:

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

protocols/yahoo/yahoo.c

@@ -443 +443 @@
 };
 
-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 +465 @@
 };
 
-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 +486 @@
 };
 
-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 +685 @@
                 
                 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 +696 @@
                 
                 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 +727 @@
         }
         
-        gaim_input_remove( tag );
+        b_event_remove( tag );
 }
 
@@ -738 +736 @@
         
         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 );