diff options
Diffstat (limited to 'unix.c')
| -rw-r--r-- | unix.c | 14 | 
1 files changed, 14 insertions, 0 deletions
| @@ -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,18 @@ 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(); +#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() );  	global.helpfile = g_strdup( HELP_FILE ); | 
