Changes in unix.c [fef7813:858ea01]

File:

• unix.c (modified) (3 diffs)

unix.c

@@ -29 +29 @@
 #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"
@@ -68 +70 @@
         
         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();
+#ifdef OTR_BI
+        otr_init();
+#endif
+        /* And in case OTR is loaded as a plugin, it'll also get loaded after
+           this point. */
         
         srand( time( NULL ) ^ getpid() );
@@ -167 +181 @@
                    doesn't make a copy. Odd. */
                 
-                i = chdir( old_cwd );
+                chdir( old_cwd );
                 close( global.listen_socket );