# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1140551755 0
# Node ID 10c26505d6dbaafe0e034aa7e957de8f5fd10e88
# Parent  128324dcc821473aee13f027f3113dc3cca26a38
[gaim-migrate @ 15676]
Warn about prpls with preferences.

committer: Tailor Script <tailor@pidgin.im>

diff -r 128324dcc821 -r 10c26505d6db src/plugin.c
--- a/src/plugin.c	Tue Feb 21 19:45:14 2006 +0000
+++ b/src/plugin.c	Tue Feb 21 19:55:55 2006 +0000
@@ -448,17 +448,26 @@
 		return plugin;
 	}
 
-	/* If plugin is a PRPL, make sure it implements the required functions */
-	if ((plugin->info->type == GAIM_PLUGIN_PROTOCOL) && (
-		(GAIM_PLUGIN_PROTOCOL_INFO(plugin)->list_icon == NULL) ||
-		(GAIM_PLUGIN_PROTOCOL_INFO(plugin)->login == NULL) ||
-		(GAIM_PLUGIN_PROTOCOL_INFO(plugin)->close == NULL)))
+	if (plugin->info->type == GAIM_PLUGIN_PROTOCOL)
 	{
-		plugin->error = g_strdup(_("Plugin does not implement all required functions"));
-		gaim_debug_error("plugins", "%s is unloadable: Plugin does not implement all required functions\n",
-				 plugin->path);
-		plugin->unloadable = TRUE;
-		return plugin;
+		/* If plugin is a PRPL, make sure it implements the required functions */
+		if ((GAIM_PLUGIN_PROTOCOL_INFO(plugin)->list_icon == NULL) ||
+		    (GAIM_PLUGIN_PROTOCOL_INFO(plugin)->login == NULL) ||
+		    (GAIM_PLUGIN_PROTOCOL_INFO(plugin)->close == NULL))
+		{
+			plugin->error = g_strdup(_("Plugin does not implement all required functions"));
+			gaim_debug_error("plugins", "%s is unloadable: Plugin does not implement all required functions\n",
+					 plugin->path);
+			plugin->unloadable = TRUE;
+			return plugin;
+		}
+
+		/* For debugging, let's warn about prpl prefs. */
+		if (plugin->info->prefs_info != NULL)
+		{
+			gaim_debug_error("plugins", "%s has a prefs_info, but is a prpl. This is no longer supported.\n",
+			                 plugin->path);
+		}
 	}
 
 	return plugin;