comparison src/plugin.c @ 12985:de3a3669dbe1

[gaim-migrate @ 15338] Fix a looping oddness I was seeing, it didn't seem to hurt anything that I saw, but it certainly wasn't right. committer: Tailor Script <[e-mail]>

12984:d1e6890ed062

gboolean
gaim_plugin_unload(GaimPlugin *plugin)
{
#ifdef GAIM_PLUGINS
	GList *l;
	
	g_return_val_if_fail(plugin != NULL, FALSE);

	loaded_plugins = g_list_remove(loaded_plugins, plugin);
	if ((plugin->info != NULL) && GAIM_IS_PROTOCOL_PLUGIN(plugin))
		protocol_plugins = g_list_remove(protocol_plugins, plugin);

	gaim_notify_close_with_handle(plugin);

	plugin->loaded = FALSE;

	/* Unload all plugins that depend on this plugin. */
	for (l = plugin->dependent_plugins; l != NULL; l = l->next)
	{
		const char * dep_name = (const char *)l->data;
		GaimPlugin *dep_plugin;

		dep_plugin = gaim_plugins_find_with_id(dep_name);

		if (dep_plugin != NULL && gaim_plugin_is_loaded(dep_plugin))
		{

12985:de3a3669dbe1

gboolean
gaim_plugin_unload(GaimPlugin *plugin)
{
#ifdef GAIM_PLUGINS
	GList *l, *l_next;

	g_return_val_if_fail(plugin != NULL, FALSE);

	loaded_plugins = g_list_remove(loaded_plugins, plugin);
	if ((plugin->info != NULL) && GAIM_IS_PROTOCOL_PLUGIN(plugin))
		protocol_plugins = g_list_remove(protocol_plugins, plugin);

	gaim_notify_close_with_handle(plugin);

	plugin->loaded = FALSE;

	/* Unload all plugins that depend on this plugin. */
	/* XXX Does this want to be while (plugin->dependent_plugins != NULL)
	 * instead of this loop? I fixed it to get l->next before calling
	 * gaim_plugin_unload (which can change the list here). This worked
	 * much better for me but I'm not 100% sure it will always work. */
	for (l = plugin->dependent_plugins; l != NULL; l = l_next)
	{
		const char * dep_name = (const char *)l->data;
		GaimPlugin *dep_plugin;

		l_next = l->next;

		dep_plugin = gaim_plugins_find_with_id(dep_name);

		if (dep_plugin != NULL && gaim_plugin_is_loaded(dep_plugin))
		{