Merge trunk.

1 files changed, 5 insertions, 2 deletions

diff --git a/ipc.h b/ipc.h
index db05d63c..f3d24614 100644
--- a/ipc.h
+++ b/ipc.h
@@ -39,12 +39,15 @@ struct bitlbee_child
 };
 
 
-void ipc_master_read( gpointer data, gint source, GaimInputCondition cond );
-void ipc_child_read( gpointer data, gint source, GaimInputCondition cond );
+gboolean ipc_master_read( gpointer data, gint source, b_input_condition cond );
+gboolean ipc_child_read( gpointer data, gint source, b_input_condition cond );
 
 void ipc_master_free_one( struct bitlbee_child *child );
+void ipc_master_free_fd( int fd );
 void ipc_master_free_all();
 
+void ipc_child_disable();
+
 void ipc_to_master( char **cmd );
 void ipc_to_master_str( char *format, ... ) G_GNUC_PRINTF( 1, 2 );
 void ipc_to_children( char **cmd );