# HG changeset patch # User Herman Bloggs # Date 1068947258 0 # Node ID 8beec54d1855dc318c915266748bb88213b6c183 # Parent f25119847c5b44ed9d0d571bace0d6d9e39151a8 [gaim-migrate @ 8134] Consolidated two windows init funcs committer: Tailor Script diff -r f25119847c5b -r 8beec54d1855 src/main.c --- a/src/main.c Sun Nov 16 01:46:19 2003 +0000 +++ b/src/main.c Sun Nov 16 01:47:38 2003 +0000 @@ -826,13 +826,11 @@ gaim_gtk_stock_init(); +#ifdef _WIN32 + wgaim_init(hint); +#endif gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops()); -#ifdef _WIN32 - wgaim_set_hinstance(hint); - wgaim_pre_plugin_init(); -#endif - if (!gaim_core_init(GAIM_GTK_UI)) { fprintf(stderr, "Initialization of the Gaim core failed. Dumping core.\n" @@ -869,11 +867,6 @@ gaim_pounces_load(); gaim_status_load(); -#ifdef _WIN32 - /* Various win32 initializations */ - wgaim_init(); -#endif - gaim_set_blist(gaim_blist_new()); gaim_blist_load();