pidgin: b2e4328c: If plugins are enabled and some protocol...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: b2e4328cd3f7566e4dbe7352abb27bff7d4e906d
Ancestor: 8ec6341e118da4713e16199b3d4314d6a08693db
Author: evands at pidgin.im
Date: 2008-05-26T14:30:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b2e4328cd3f7566e4dbe7352abb27bff7d4e906d

Modified files:
        libpurple/core.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/core.c	296a5b4539aeeea43a5734240ea42982766dc38f
+++ libpurple/core.c	0086adbca66e71ab77f59508b10b2c54c03a69c0
@@ -131,13 +131,14 @@ purple_core_init(const char *ui)
 
 	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. */