Mercurial > pidgin.yaz

changeset 23204:aa6395907702

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If plugins are enabled and some protocols or plugins are also being compiled statically, static_proto_init() throws assertions as the plugin subsystem needs to have been initialized before the prpls are. We now call static_proto_init() after purple_plugins_init() and before purple_plugins_probe() so that static prpls are also available for any plugins which load.
author Evan Schoenberg <evan.s@dreskin.net>
date Mon, 26 May 2008 14:30:00 +0000
parents 326b1b389a88
children 04869393b7ef 84693a70ea3a
files libpurple/core.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/core.c	Mon May 26 06:50:06 2008 +0000
+++ b/libpurple/core.c	Mon May 26 14:30:00 2008 +0000
@@ -131,13 +131,14 @@
 
 	purple_ciphers_init();
 
-	/* Initialize all static protocols. */
-	static_proto_init();
-
 	/* Since plugins get probed so early we should probably initialize their
 	 * subsystem right away too.
 	 */
 	purple_plugins_init();
+	
+	/* Initialize all static protocols. */
+	static_proto_init();
+
 	purple_plugins_probe(G_MODULE_SUFFIX);
 
 	/* The buddy icon code uses the imgstore, so init it early. */