brasero r1675 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Wed Dec 31 16:16:35 2008
New Revision: 1675
URL: http://svn.gnome.org/viewvc/brasero?rev=1675&view=rev

Log:
2008-12-31  Philippe Rouquier  <ykw localhost localdomain>

	Use GConf provided function to escape plugin names

	* src/burn-plugin-manager.c (brasero_plugin_manager_init):
	* src/burn-plugin.c (brasero_plugin_get_gconf_priority_key):


Modified:
   trunk/ChangeLog
   trunk/src/burn-plugin-manager.c
   trunk/src/burn-plugin.c

Modified: trunk/src/burn-plugin-manager.c
==============================================================================
--- trunk/src/burn-plugin-manager.c	(original)
+++ trunk/src/burn-plugin-manager.c	Wed Dec 31 16:16:35 2008
@@ -475,11 +475,6 @@
 			continue;
 		}
 
-		g_signal_connect (plugin,
-				  "activated",
-				  G_CALLBACK (brasero_plugin_manager_plugin_state_changed),
-				  self);
-
 		if (brasero_plugin_get_gtype (plugin) == G_TYPE_NONE) {
 			BRASERO_BURN_LOG ("Load failure, no GType was returned %s",
 					  brasero_plugin_get_error (plugin));
@@ -487,7 +482,12 @@
 			continue;
 		}
 
-		g_assert(brasero_plugin_get_name(plugin));
+		g_signal_connect (plugin,
+				  "activated",
+				  G_CALLBACK (brasero_plugin_manager_plugin_state_changed),
+				  self);
+
+		g_assert (brasero_plugin_get_name(plugin));
 		priv->plugins = g_slist_prepend (priv->plugins, plugin);
 	}
 	g_dir_close (directory);

Modified: trunk/src/burn-plugin.c
==============================================================================
--- trunk/src/burn-plugin.c	(original)
+++ trunk/src/burn-plugin.c	Wed Dec 31 16:16:35 2008
@@ -395,13 +395,11 @@
 	else if (brasero_plugin_can_convert (self) == BRASERO_BURN_OK)
 		type = 2;
 
-	gconf_name = g_strdup (priv->name);
-	g_strdelimit (gconf_name, " +()", '_');
+	gconf_name = gconf_escape_key (priv->name, -1);
 	priority_path = g_strdup_printf ("%s/%s-%s",
 					 BRASERO_PLUGIN_PRIORITY_KEY,
 					 gconf_name,
 					 category [type]);
-
 	g_free (gconf_name);
 	g_object_unref (caps);