Changeset 4aa0f6b for irc.c


Ignore:
Timestamp:
2010-06-07T14:31:07Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
56699f0
Parents:
0d9d53e (diff), 1fdb0a4 (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 killerbee stuff, bringing all the bleeding-edge stuff together.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc.c

    r0d9d53e r4aa0f6b  
    2626#include "bitlbee.h"
    2727#include "ipc.h"
     28#include "dcc.h"
    2829
    2930GSList *irc_connection_list;
     
    4849        sock_make_nonblocking( irc->fd );
    4950       
    50         irc->r_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_READ, bitlbee_io_current_client_read, irc );
     51        irc->r_watch_source_id = b_input_add( irc->fd, B_EV_IO_READ, bitlbee_io_current_client_read, irc );
    5152       
    5253        irc->status = USTATUS_OFFLINE;
     
    143144        g_free( myhost );
    144145        g_free( host );
     146       
     147        nogaim_init();
    145148       
    146149        return irc;
     
    550553                if( now )
    551554                {
    552                         bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE );
     555                        bitlbee_io_current_client_write( irc, irc->fd, B_EV_IO_WRITE );
    553556                }
    554557                temp = temp->next;
     
    605608                   in the event queue. */
    606609                /* Really can't be done as long as the code doesn't do error checking very well:
    607                 if( bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE ) ) */
     610                if( bitlbee_io_current_client_write( irc, irc->fd, B_EV_IO_WRITE ) ) */
    608611               
    609612                /* So just always do it via the event handler. */
    610                 irc->w_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_WRITE, bitlbee_io_current_client_write, irc );
     613                irc->w_watch_source_id = b_input_add( irc->fd, B_EV_IO_WRITE, bitlbee_io_current_client_write, irc );
    611614        }
    612615       
     
    736739}
    737740
    738 
    739741/* Returns 0 if everything seems to be okay, a number >0 when there was a
    740742   timeout. The number returned is the number of seconds we received no
Note: See TracChangeset for help on using the changeset viewer.