Changes in / [c2ee85c:85cf37f]

Location:

protocols

Files:

• events.h (modified) (1 diff)
• events_glib.c (modified) (1 diff)
• events_libevent.c (modified) (2 diffs)
• nogaim.c (modified) (3 diffs)
• yahoo/yahoo.c (modified) (2 diffs)

protocols/events.h

@@ -59 +59 @@
 G_MODULE_EXPORT gint b_timeout_add(gint timeout, b_event_handler func, gpointer data);
 G_MODULE_EXPORT void b_event_remove(gint id);
+G_MODULE_EXPORT gboolean b_event_remove_by_data(gpointer data);
 
 #ifdef EVENTS_LIBEVENT

protocols/events_glib.c

@@ -136 +136 @@
                 g_source_remove(tag);
 }
+
+gboolean b_event_remove_by_data(gpointer data)
+{
+        return g_source_remove_by_user_data(data);
+}

protocols/events_libevent.c

@@ -212 +212 @@
 }
 
+gboolean b_event_remove_by_data( gpointer data )
+{
+        /* FIXME! */
+        event_debug( "FALSE!\n" );
+        return FALSE;
+}
+
 void closesocket( int fd )
 {
@@ -222 +229 @@
            properly before closing a socket. */
         
-        if( ( b_ev = g_hash_table_lookup( read_hash, &fd ) ) )
+        if( b_ev = g_hash_table_lookup( read_hash, &fd ) )
         {
                 event_debug( "Warning: fd %d still had a read event handler when shutting down.\n", fd );
                 b_event_remove( b_ev->id );
         }
-        if( ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) )
+        if( b_ev = g_hash_table_lookup( write_hash, &fd ) )
         {
                 event_debug( "Warning: fd %d still had a write event handler when shutting down.\n", fd );

protocols/nogaim.c

@@ -248 +248 @@
          * This fixes daemon mode breakage where IRC doesn't point to the currently active connection.
          */
-        gc->irc = user->irc;
+        gc->irc=user->irc;
         
         connections = g_slist_append( connections, gc );
@@ -372 +372 @@
 void cancel_auto_reconnect( account_t *a )
 {
-        /* while( b_event_remove_by_data( (gpointer) a ) ); */
-        b_event_remove( a->reconnect );
+        while( b_event_remove_by_data( (gpointer) a ) );
         a->reconnect = 0;
 }
@@ -415 +414 @@
         {
                 int delay = set_getint( irc, "auto_reconnect_delay" );
-                
                 serv_got_crap( gc, "Reconnecting in %d seconds..", delay );
-                a->reconnect = b_timeout_add( delay * 1000, auto_reconnect, a );
+                
+                a->reconnect = 1;
+                b_timeout_add( delay * 1000, auto_reconnect, a );
         }
         

protocols/yahoo/yahoo.c

@@ -470 +470 @@
         
         if( !byahoo_get_gc_by_id( d->id ) )
+        {
                 /* WTF doesn't libyahoo clean this up? */
+                ext_yahoo_remove_handler( d->id, d->tag );
                 return FALSE;
+        }
         
         yahoo_read_ready( d->id, d->fd, d->data );
-        
-        return TRUE;
 }
 
@@ -491 +492 @@
         
         if( !byahoo_get_gc_by_id( d->id ) )
+        {
                 /* WTF doesn't libyahoo clean this up? */
+                ext_yahoo_remove_handler( d->id, d->tag );
                 return FALSE;
+        }
         
         yahoo_write_ready( d->id, d->fd, d->data );
-        
-        return FALSE;
 }