rhythmbox r6021 - in trunk: . plugins

[jmatthew svn gnome org]

Author: jmatthew
Date: Sat Nov  8 11:04:13 2008
New Revision: 6021
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6021&view=rev

Log:
2008-11-08  Jonathan Matthew  <jonathan d14n org>

	patch by:  Susana Pereira  <susana pereira gmail com>

	* plugins/rb-plugins-engine.c: (rb_plugins_engine_activate_plugin):
	Apply some changes from totem's copy of the plugin code to disable
	non-hidden plugins in gconf when they fail to load.  Fixes #551295.


Modified:
   trunk/ChangeLog
   trunk/plugins/rb-plugins-engine.c

Modified: trunk/plugins/rb-plugins-engine.c
==============================================================================
--- trunk/plugins/rb-plugins-engine.c	(original)
+++ trunk/plugins/rb-plugins-engine.c	Sat Nov  8 11:04:13 2008
@@ -531,22 +531,27 @@
 gboolean
 rb_plugins_engine_activate_plugin (RBPluginInfo *info)
 {
+	gboolean ret;
+
 	g_return_val_if_fail (info != NULL, FALSE);
 
 	if (info->active)
 		return TRUE;
 
-	if (rb_plugins_engine_activate_plugin_real (info, rb_plugins_shell)) {
+	ret = rb_plugins_engine_activate_plugin_real (info, rb_plugins_shell);
+
+	if (info->visible != FALSE || ret != FALSE) {
 		char *key_name;
 
 		key_name = g_strdup_printf (CONF_PLUGIN_ACTIVE_KEY, info->location);
-		eel_gconf_set_boolean (key_name, TRUE);
+		eel_gconf_set_boolean (key_name, ret);
 		g_free (key_name);
-
-		info->active = TRUE;
-
-		return TRUE;
 	}
+        info->active = ret;
+ 
+        if (ret != FALSE)
+                return TRUE;
+
 
 	rb_error_dialog (NULL, _("Plugin Error"), _("Unable to activate plugin %s"), info->name);