- Timestamp:
- 2010-06-07T14:31:07Z (14 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
irc.c
r0d9d53e r4aa0f6b 26 26 #include "bitlbee.h" 27 27 #include "ipc.h" 28 #include "dcc.h" 28 29 29 30 GSList *irc_connection_list; … … 48 49 sock_make_nonblocking( irc->fd ); 49 50 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 ); 51 52 52 53 irc->status = USTATUS_OFFLINE; … … 143 144 g_free( myhost ); 144 145 g_free( host ); 146 147 nogaim_init(); 145 148 146 149 return irc; … … 550 553 if( now ) 551 554 { 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 ); 553 556 } 554 557 temp = temp->next; … … 605 608 in the event queue. */ 606 609 /* 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 ) ) */ 608 611 609 612 /* 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 ); 611 614 } 612 615 … … 736 739 } 737 740 738 739 741 /* Returns 0 if everything seems to be okay, a number >0 when there was a 740 742 timeout. The number returned is the number of seconds we received no
Note: See TracChangeset
for help on using the changeset viewer.