Changeset 2945c6f for ipc.h

Timestamp:

2010-07-24T21:16:18Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f1f7b5e

Parents:

ef14a83 (diff), 593971d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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.

File:

• ipc.h (modified) (3 diffs)

ipc.h

@@ -2 +2 @@
   * 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                *
   \********************************************************************/
 
@@ -37 +37 @@
         char *nick;
         char *realname;
+        
+        char *password;
+        
+        /* For takeovers: */
+        struct bitlbee_child *to_child;
+        int to_fd;
 };
 
@@ -48 +54 @@
 
 void ipc_child_disable();
+
+gboolean ipc_child_identify( irc_t *irc );
 
 void ipc_to_master( char **cmd );