brasero r1809 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Thu Jan 22 20:31:34 2009
New Revision: 1809
URL: http://svn.gnome.org/viewvc/brasero?rev=1809&view=rev

Log:
2009-01-22  Philippe Rouquier  <ykw localhost localdomain>

	Fix #567603 â Invalid GConf key when coping disk to image file

	Use gconf_escaped_key () instead of a homegrown one

	* src/brasero-session-cfg.c (brasero_session_cfg_get_gconf_key):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-session-cfg.c

Modified: trunk/src/brasero-session-cfg.c
==============================================================================
--- trunk/src/brasero-session-cfg.c	(original)
+++ trunk/src/brasero-session-cfg.c	Thu Jan 22 20:31:34 2009
@@ -97,20 +97,24 @@
 		return NULL;
 	
 	/* make sure display_name doesn't contain any forbidden characters */
-	display_name = brasero_drive_get_display_name (drive);
-	g_strdelimit (display_name, " +()", '_');
+	if (!brasero_drive_is_fake (drive)) {
+		gchar *tmp;
 
-	disc_type = g_strdup (brasero_medium_get_type_string (medium));
+		tmp = brasero_drive_get_display_name (drive);
+		display_name = gconf_escape_key (tmp, -1);
+		g_free (tmp);
+	}
+	else
+		display_name = g_strdup ("File");
+
+	display_name = display_name ? display_name : "";
+
+	disc_type = gconf_escape_key (brasero_medium_get_type_string (medium), -1);
 	if (!disc_type) {
 		g_free (display_name);
 		return NULL;
 	}
 
-	g_strdelimit (disc_type, " +()", '_');
-
-	display_name = display_name ? display_name : "";
-	disc_type = disc_type ? disc_type : "";
-
 	switch (brasero_burn_session_get_input_type (BRASERO_BURN_SESSION (self), NULL)) {
 	case BRASERO_TRACK_TYPE_NONE:
 		key = g_strdup_printf ("%s/%s/none_%s/%s",