Changes in unix.c [764c7d1:eeb85a8]

File:

• unix.c (modified) (4 diffs)

unix.c

@@ -27 +27 @@
 #include "commands.h"
 #include "crypting.h"
-#include "otr.h"
 #include "protocols/nogaim.h"
 #include "help.h"
@@ -48 +47 @@
         
         log_init();
-        CONF_FILE = g_strdup( CONF_FILE_DEF );
+        global.conf_file = g_strdup( CONF_FILE_DEF );
         global.conf = conf_load( argc, argv );
         if( global.conf == NULL )
@@ -55 +54 @@
         b_main_init();
         nogaim_init();
-        otr_init();
         
         srand( time( NULL ) ^ getpid() );
@@ -126 +124 @@
         if( !getuid() || !geteuid() )
                 log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
-        if( help_init( &(global.help), global.helpfile ) == NULL )
+        if( help_init( &global.help, global.helpfile ) == NULL )
                 log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
         
         b_main_run();
+        
+        /* Mainly good for restarting, to make sure we close the help.txt fd. */
+        help_free( &global.help );
         
         if( global.restart )