totem r5612 - in trunk: . src/plugins

[hadess svn gnome org]

Author: hadess
Date: Wed Aug 27 15:28:49 2008
New Revision: 5612
URL: http://svn.gnome.org/viewvc/totem?rev=5612&view=rev

Log:
2008-08-27  Bastien Nocera  <hadess hadess net>

	* src/plugins/totem-plugins-engine.c
	(totem_plugins_engine_activate_plugin): When we fail to activate
	a plugin, set its GConf key to FALSE, otherwise we get bugged on
	every start up without any ways to disable it



Modified:
   trunk/ChangeLog
   trunk/src/plugins/totem-plugins-engine.c

Modified: trunk/src/plugins/totem-plugins-engine.c
==============================================================================
--- trunk/src/plugins/totem-plugins-engine.c	(original)
+++ trunk/src/plugins/totem-plugins-engine.c	Wed Aug 27 15:28:49 2008
@@ -552,25 +552,24 @@
 gboolean
 totem_plugins_engine_activate_plugin (TotemPluginInfo *info)
 {
-	char *msg;
+	char *msg, *key_name;
 	GError *error = NULL;
+	gboolean ret;
 
 	g_return_val_if_fail (info != NULL, FALSE);
 
 	if (info->active)
 		return TRUE;
 
-	if (totem_plugins_engine_activate_plugin_real (info, totem_plugins_object, &error)) {
-		char *key_name;
-
-		key_name = g_strdup_printf (GCONF_PLUGIN_ACTIVE, info->location);
-		gconf_client_set_bool (client, key_name, TRUE, NULL);
-		g_free (key_name);
+	ret = totem_plugins_engine_activate_plugin_real (info, totem_plugins_object, &error);
+	key_name = g_strdup_printf (GCONF_PLUGIN_ACTIVE, info->location);
+	gconf_client_set_bool (client, key_name, ret, NULL);
+	g_free (key_name);
 
-		info->active = TRUE;
+	info->active = ret;
 
+	if (ret != FALSE)
 		return TRUE;
-	}
 
 	if (error != NULL) {
 		msg = g_strdup_printf (_("Unable to activate plugin %s.\n%s"), info->name, error->message);