Changeset eda54e4 for unix.c


Ignore:
Timestamp:
2007-10-12T00:08:58Z (17 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
a6df0b5
Parents:
82135c7 (diff), d444c09 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from devel.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • unix.c

    r82135c7 reda54e4  
    4747        memset( &global, 0, sizeof( global_t ) );
    4848       
    49         b_main_init();
    5049        log_init();
    51         nogaim_init();
    52        
    53         srand( time( NULL ) ^ getpid() );
    54        
    5550        CONF_FILE = g_strdup( CONF_FILE_DEF );
    56         global.helpfile = g_strdup( HELP_FILE );
    57        
    5851        global.conf = conf_load( argc, argv );
    5952        if( global.conf == NULL )
    6053                return( 1 );
     54       
     55        b_main_init();
     56        nogaim_init();
     57       
     58        srand( time( NULL ) ^ getpid() );
     59        global.helpfile = g_strdup( HELP_FILE );
    6160       
    6261        if( global.conf->runmode == RUNMODE_INETD )
Note: See TracChangeset for help on using the changeset viewer.