diff src/gtkmain.c @ 10448:6a20307ef8dc

[gaim-migrate @ 11713] Fix the problem with accounts.xml being loaded before the plugins were probed. This fixes the Yahoo! crash mentioned by the guy on gaim-devel and a guy in #gaim, and a few other obscure problems. Plugins are probed* by the core now instead of the UI. Less work for UI implementors means less code duplication and makes it more likely someone will write a new UI. *Probing loads the PRPLs and any loader plugins (perl, tcl, etc.), and makes plugin information available everywhere else. committer: Tailor Script <[e-mail]>

--- a/src/gtkmain.c	Wed Dec 29 21:53:59 2004 +0000
+++ b/src/gtkmain.c	Wed Dec 29 22:48:59 2004 +0000
@@ -75,6 +75,7 @@
 static SnDisplay *sn_display = NULL;
 #endif
 
+/* TODO: Get this out of here? */
 int docklet_count = 0;
 
 #if HAVE_SIGNAL_H
@@ -588,6 +589,13 @@
 		return 1;
 	}
 
+	/*
+	 * We're done piddling around with command line arguments.
+	 * Fire up this baby.
+	 */
+
+	gaim_debug_set_enabled(debug_enabled);
+
 #ifdef _WIN32
 	wgaim_init(hint);
 #endif
@@ -608,11 +616,6 @@
 		abort();
 	}
 
-	gaim_debug_set_enabled(debug_enabled);
-
-	/* TODO: Do this in gaim_core_init() instead of here */
-	gaim_plugins_probe(NULL);
-
 	/* TODO: Remove this check.  Maybe in 2005.  --KingAnt, 25 Jul 2004 */
 	gaimrc = g_build_filename(gaim_home_dir(), ".gaimrc", NULL);
 	accountsxml = g_build_filename(gaim_user_dir(), "accounts.xml", NULL);