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, 2 insertions, 0 deletions

diff --git a/bitlbee.h b/bitlbee.h
index a137ae43..ae8f34d9 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -141,6 +141,7 @@
 #include "sock.h"
 #include "misc.h"
 #include "proxy.h"
+#include "otr.h"
 
 typedef struct global {
 	/* In forked mode, child processes store the fd of the IPC socket here. */
@@ -152,6 +153,7 @@ typedef struct global {
 	GList *storage; /* The first backend in the list will be used for saving */
 	char *helpfile;
 	int restart;
+	OtrlMessageAppOps otr_ops;   /* collects interface functions required by OTR */
 } global_t;
 
 int bitlbee_daemon_init( void );