First step in this merge. Mostly a bzr merge and then a cleanup of conflicts

and parts I want to/have to redo (because of ui-fix).

1 files changed, 5 insertions, 1 deletions

diff --git a/irc.h b/irc.h
index 58ca19c9..53081fd0 100644
--- a/irc.h
+++ b/irc.h
@@ -26,8 +26,10 @@
 #ifndef _IRC_H
 #define _IRC_H
 
+#include "otr.h"
+
 #define IRC_MAX_LINE 512
-#define IRC_MAX_ARGS 8
+#define IRC_MAX_ARGS 16
 
 #define IRC_LOGIN_TIMEOUT 60
 #define IRC_PING_STRING "PinglBee"
@@ -85,6 +87,8 @@ typedef struct irc
 	gint ping_source_id;
 	gint login_source_id; /* To slightly delay some events at login time. */
 	
+	otr_t *otr;            /* OTR state and book keeping */
+	
 	struct bee *b;
 } irc_t;