diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-14 02:17:25 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2005-12-14 02:17:25 +0100 |
commit | 703f0f7f4622194bce8023712a3a9966be6f8827 (patch) | |
tree | 311125ae518c2b277845dc78ec62fc9553081bdf /unix.c | |
parent | 22bf64eab8a79352317ee190cddfeef3011aa8dc (diff) | |
parent | 568aaf7ce17a4db2dddd13f8baed02a6d2757eb6 (diff) |
Merge my pluginable branch
Diffstat (limited to 'unix.c')
-rw-r--r-- | unix.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -46,8 +46,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 ); |