Merge ui-fix (which includes killerbee (i.e. file transfers and libpurple

support)). ui-fix rewrites the complete IRC core, fixing many things that
were broken/hacky/limited so far.

The list is too long to include here, but http://wiki.bitlbee.org/UiFix
has a summary, as does doc/CHANGES and of course the full revision history.

1 files changed, 9 insertions, 1 deletions

diff --git a/ipc.h b/ipc.h
index 0e71c520..3e71a070 100644
--- a/ipc.h
+++ b/ipc.h
@@ -1,7 +1,7 @@
   /********************************************************************\
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
 /* IPC - communication between BitlBee processes                        */
@@ -36,6 +36,12 @@ struct bitlbee_child
 	char *host;
 	char *nick;
 	char *realname;
+	
+	char *password;
+	
+	/* For takeovers: */
+	struct bitlbee_child *to_child;
+	int to_fd;
 };
 
 
@@ -48,6 +54,8 @@ void ipc_master_free_all();
 
 void ipc_child_disable();
 
+gboolean ipc_child_identify( irc_t *irc );
+
 void ipc_to_master( char **cmd );
 void ipc_to_master_str( char *format, ... ) G_GNUC_PRINTF( 1, 2 );
 void ipc_to_children( char **cmd );