diff libpurple/plugin.c @ 15927:2b8d4fabc103

merge of '479ec3bc42bb56e872fb1e8d5975ee5cc73f9cb8' and 'af97194f292b3a82f2a36fc3094f579a3dfc2841'

--- a/libpurple/plugin.c	Sat Mar 24 20:25:01 2007 +0000
+++ b/libpurple/plugin.c	Mon Mar 26 03:01:33 2007 +0000
@@ -369,12 +369,12 @@
 		return plugin;
 	}
 
-	/* 
- 	 * Check to make sure a plugin has defined an id.
- 	 * Not having this check caused purple_plugin_unload to
- 	 * enter an infinite loop in certain situations by passing
- 	 * purple_find_plugin_by_id a NULL value. -- ecoffey
- 	 */
+	/*
+	 * Check to make sure a plugin has defined an id.
+	 * Not having this check caused purple_plugin_unload to
+	 * enter an infinite loop in certain situations by passing
+	 * purple_find_plugin_by_id a NULL value. -- ecoffey
+	 */
 	if (plugin->info->id == NULL || *plugin->info->id == '\0')
 	{
 		plugin->error = g_strdup_printf(_("This plugin has not defined an ID."));
@@ -672,12 +672,10 @@
 		{
 			if (!purple_plugin_unload(dep_plugin))
 			{
-				char *translated_name = g_strdup(_(dep_plugin->info->name));
 				char *tmp;
 
 				tmp = g_strdup_printf(_("The dependent plugin %s failed to unload."),
-				                      translated_name);
-				g_free(translated_name);
+				                      _(dep_plugin->info->name));
 
 				purple_notify_error(NULL, NULL,
 				                  _("There were errors unloading the plugin."), tmp);