merged in upstream r410.

Only conflict was the correction of jabber normalization which I had already done.

1 files changed, 1 insertions, 2 deletions

diff --git a/ipc.h b/ipc.h
index f3d24614..0e71c520 100644
--- a/ipc.h
+++ b/ipc.h
@@ -57,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;