diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-11-07 17:16:18 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2005-11-07 17:16:18 +0100 |
commit | 7b23afdeead5b873b3e1cfc5ab29ecbf35b8c0ac (patch) | |
tree | 975c4b3725525244353f722b60fef54b79628d92 /unix.c | |
parent | fe51bcf0ae238e6fde4400b3dd17ddf99f77ae2a (diff) |
Migrate my pluginable branch to use Wilmers' branch as parent
Diffstat (limited to 'unix.c')
-rw-r--r-- | unix.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -47,8 +47,9 @@ int main( int argc, char *argv[] ) global.loop = g_main_new( FALSE ); log_init( ); - nogaim_init( ); - + + nogaim_init(); + CONF_FILE = g_strdup( CONF_FILE_DEF ); global.helpfile = g_strdup( HELP_FILE ); |