# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1131953161 0
# Node ID 5a08737f76c6d75d52745c8cdd77d9ab0129af4f
# Parent  3b52d94437f382c07792f1a96a0441232310d5b9
[gaim-migrate @ 14378]
sf patch #1355683, from Evan Schoenberg
"As discussed in #gaim, static plugins are fairly broken at present...
this may not be a fix for all possible plugins, but it certainly fixes all
the prpls and the ssl plugin to be able to work. We need to call the
plugin_load() function manually since plugins_probe() isn't going to
do it..."

committer: Tailor Script <tailor@pidgin.im>

diff -r 3b52d94437f3 -r 5a08737f76c6 src/plugin.c
--- a/src/plugin.c	Mon Nov 14 07:20:22 2005 +0000
+++ b/src/plugin.c	Mon Nov 14 07:26:01 2005 +0000
@@ -1140,9 +1140,15 @@
 	/* This plugin should be probed and maybe loaded--add it to the queue */
 	load_queue = g_list_append(load_queue, plugin);
 #else
-	if (plugin->info->type == GAIM_PLUGIN_PROTOCOL)
-		protocol_plugins = g_list_insert_sorted(protocol_plugins, plugin,
-												(GCompareFunc)compare_prpl);
+	if (plugin->info != NULL)
+	{
+		if (plugin->info->type == GAIM_PLUGIN_PROTOCOL)
+			protocol_plugins = g_list_insert_sorted(protocol_plugins, plugin,
+													(GCompareFunc)compare_prpl);
+		if (plugin->info->load != NULL)
+			if (!plugin->info->load(plugin))
+				return FALSE;
+	}
 #endif
 
 	plugins = g_list_append(plugins, plugin);