diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-07 15:31:07 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-07 15:31:07 +0100 |
| commit | 4aa0f6bc5645e124738ab15ad1eb65d4147dba25 (patch) | |
| tree | 0f15a76a814c33c8759c9d97253423ed12c0e1cc /bitlbee.c | |
| parent | 0d9d53ed0b3eb068cf57355a4d1465beaf191f8a (diff) | |
| parent | 1fdb0a48438d6dc4a4795d195737890ed3e46a96 (diff) | |
Merging killerbee stuff, bringing all the bleeding-edge stuff together.
Diffstat (limited to 'bitlbee.c')
| -rw-r--r-- | bitlbee.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -120,7 +120,7 @@ int bitlbee_daemon_init() return( -1 ); } - global.listen_watch_source_id = b_input_add( global.listen_socket, GAIM_INPUT_READ, bitlbee_io_new_client, NULL ); + global.listen_watch_source_id = b_input_add( global.listen_socket, B_EV_IO_READ, bitlbee_io_new_client, NULL ); #ifndef _WIN32 if( !global.conf->nofork ) @@ -320,7 +320,7 @@ static gboolean bitlbee_io_new_client( gpointer data, gint fd, b_input_condition child = g_new0( struct bitlbee_child, 1 ); child->pid = client_pid; child->ipc_fd = fds[0]; - child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child ); + child->ipc_inpa = b_input_add( child->ipc_fd, B_EV_IO_READ, ipc_master_read, child ); child_list = g_slist_append( child_list, child ); log_message( LOGLVL_INFO, "Creating new subprocess with pid %d.", (int) client_pid ); @@ -348,7 +348,7 @@ static gboolean bitlbee_io_new_client( gpointer data, gint fd, b_input_condition /* We can store the IPC fd there now. */ global.listen_socket = fds[1]; - global.listen_watch_source_id = b_input_add( fds[1], GAIM_INPUT_READ, ipc_child_read, irc ); + global.listen_watch_source_id = b_input_add( fds[1], B_EV_IO_READ, ipc_child_read, irc ); close( fds[0] ); |