From: Richard L. <rl...@us...> - 2006-02-21 19:55:58
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3084/src Modified Files: plugin.c Log Message: Warn about prpls with preferences. Index: plugin.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/plugin.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -p -r1.88 -r1.89 --- plugin.c 12 Feb 2006 18:21:58 -0000 1.88 +++ plugin.c 21 Feb 2006 19:55:55 -0000 1.89 @@ -448,17 +448,26 @@ gaim_plugin_probe(const char *filename) 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; |