merge in latest trunk

1 files changed, 4 insertions, 2 deletions

diff --git a/ipc.h b/ipc.h
index 68926dfd..0e71c520 100644
--- a/ipc.h
+++ b/ipc.h
@@ -43,8 +43,11 @@ 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 );
@@ -54,8 +57,7 @@ void ipc_to_children_str( char *format, ... ) G_GNUC_PRINTF( 1, 2 );
 void ipc_master_cmd_rehash( irc_t *data, char **cmd );
 
 char *ipc_master_save_state();
-void ipc_master_set_statefile( char *fn );
-int ipc_master_load_state();
+int ipc_master_load_state( char *statefile );
 int ipc_master_listen_socket();
 
 extern GSList *child_list;