Mercurial > pidgin

changeset 7521:8beec54d1855

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 8134] Consolidated two windows init funcs committer: Tailor Script <tailor@pidgin.im>
author Herman Bloggs <hermanator12002@yahoo.com>
date Sun, 16 Nov 2003 01:47:38 +0000
parents f25119847c5b
children 07156f873116
files src/main.c
diffstat 1 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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();