Changes in / [85cf37f:c2ee85c]


Ignore:
Location:
protocols
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • protocols/events.h

    r85cf37f rc2ee85c  
    5959G_MODULE_EXPORT gint b_timeout_add(gint timeout, b_event_handler func, gpointer data);
    6060G_MODULE_EXPORT void b_event_remove(gint id);
    61 G_MODULE_EXPORT gboolean b_event_remove_by_data(gpointer data);
    6261
    6362#ifdef EVENTS_LIBEVENT
  • protocols/events_glib.c

    r85cf37f rc2ee85c  
    136136                g_source_remove(tag);
    137137}
    138 
    139 gboolean b_event_remove_by_data(gpointer data)
    140 {
    141         return g_source_remove_by_user_data(data);
    142 }
  • protocols/events_libevent.c

    r85cf37f rc2ee85c  
    212212}
    213213
    214 gboolean b_event_remove_by_data( gpointer data )
    215 {
    216         /* FIXME! */
    217         event_debug( "FALSE!\n" );
    218         return FALSE;
    219 }
    220 
    221214void closesocket( int fd )
    222215{
     
    229222           properly before closing a socket. */
    230223       
    231         if( b_ev = g_hash_table_lookup( read_hash, &fd ) )
     224        if( ( b_ev = g_hash_table_lookup( read_hash, &fd ) ) )
    232225        {
    233226                event_debug( "Warning: fd %d still had a read event handler when shutting down.\n", fd );
    234227                b_event_remove( b_ev->id );
    235228        }
    236         if( b_ev = g_hash_table_lookup( write_hash, &fd ) )
     229        if( ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) )
    237230        {
    238231                event_debug( "Warning: fd %d still had a write event handler when shutting down.\n", fd );
  • protocols/nogaim.c

    r85cf37f rc2ee85c  
    248248         * This fixes daemon mode breakage where IRC doesn't point to the currently active connection.
    249249         */
    250         gc->irc=user->irc;
     250        gc->irc = user->irc;
    251251       
    252252        connections = g_slist_append( connections, gc );
     
    372372void cancel_auto_reconnect( account_t *a )
    373373{
    374         while( b_event_remove_by_data( (gpointer) a ) );
     374        /* while( b_event_remove_by_data( (gpointer) a ) ); */
     375        b_event_remove( a->reconnect );
    375376        a->reconnect = 0;
    376377}
     
    414415        {
    415416                int delay = set_getint( irc, "auto_reconnect_delay" );
     417               
    416418                serv_got_crap( gc, "Reconnecting in %d seconds..", delay );
    417                
    418                 a->reconnect = 1;
    419                 b_timeout_add( delay * 1000, auto_reconnect, a );
     419                a->reconnect = b_timeout_add( delay * 1000, auto_reconnect, a );
    420420        }
    421421       
  • protocols/yahoo/yahoo.c

    r85cf37f rc2ee85c  
    470470       
    471471        if( !byahoo_get_gc_by_id( d->id ) )
    472         {
    473472                /* WTF doesn't libyahoo clean this up? */
    474                 ext_yahoo_remove_handler( d->id, d->tag );
    475473                return FALSE;
    476         }
    477474       
    478475        yahoo_read_ready( d->id, d->fd, d->data );
     476       
     477        return TRUE;
    479478}
    480479
     
    492491       
    493492        if( !byahoo_get_gc_by_id( d->id ) )
    494         {
    495493                /* WTF doesn't libyahoo clean this up? */
    496                 ext_yahoo_remove_handler( d->id, d->tag );
    497494                return FALSE;
    498         }
    499495       
    500496        yahoo_write_ready( d->id, d->fd, d->data );
     497       
     498        return FALSE;
    501499}
    502500
Note: See TracChangeset for help on using the changeset viewer.