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

diff --git a/unix.c b/unix.c
index c3ecbc99..11997732 100644
--- a/unix.c
+++ b/unix.c
@@ -28,9 +28,11 @@
 #include "arc.h"
 #include "base64.h"
 #include "commands.h"
+#include "otr.h"
 #include "protocols/nogaim.h"
 #include "help.h"
 #include "ipc.h"
+#include "lib/ssl_client.h"
 #include "md5.h"
 #include "misc.h"
 #include <signal.h>
@@ -68,6 +70,14 @@ int main( int argc, char *argv[] )
 	
 	b_main_init();
 	
+ 	/* Ugly Note: libotr and gnutls both use libgcrypt. libgcrypt
+ 	   has a process-global config state whose initialization happpens
+ 	   twice if libotr and gnutls are used together. libotr installs custom
+ 	   memory management functions for libgcrypt while our gnutls module
+ 	   uses the defaults. Therefore we initialize OTR after SSL. *sigh* */
+ 	ssl_init();
+ 	otr_init();
+	
 	srand( time( NULL ) ^ getpid() );
 	
 	global.helpfile = g_strdup( HELP_FILE );