# HG changeset patch # User Evan Schoenberg # Date 1211812200 0 # Node ID aa639590770295a7c4cd78ad1def711308d9f26b # Parent 326b1b389a88d2f8b58565a2a5a2ec1eb38523c9 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. diff -r 326b1b389a88 -r aa6395907702 libpurple/core.c --- 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. */