From 60c1a4e76a343c0dbc19690b486190681265db4c Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 30 Aug 2007 23:30:27 +0100 Subject: Changed the order in which things are loaded a little bit so global.conf->plugindir is actually filled in before we call nogaim_init(). --- unix.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'unix.c') diff --git a/unix.c b/unix.c index 2be16b2b..0abf43ea 100644 --- a/unix.c +++ b/unix.c @@ -46,19 +46,18 @@ int main( int argc, char *argv[], char **envp ) memset( &global, 0, sizeof( global_t ) ); - b_main_init(); log_init(); - nogaim_init(); - - srand( time( NULL ) ^ getpid() ); - CONF_FILE = g_strdup( CONF_FILE_DEF ); - global.helpfile = g_strdup( HELP_FILE ); - global.conf = conf_load( argc, argv ); if( global.conf == NULL ) return( 1 ); + b_main_init(); + nogaim_init(); + + srand( time( NULL ) ^ getpid() ); + global.helpfile = g_strdup( HELP_FILE ); + if( global.conf->runmode == RUNMODE_INETD ) { i = bitlbee_inetd_init(); -- cgit v1.2.3