brasero r1128 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Wed Aug 20 11:50:50 2008
New Revision: 1128
URL: http://svn.gnome.org/viewvc/brasero?rev=1128&view=rev

Log:
	Fix #548543 â Crash when loading project

	* src/brasero-data-vfs.c (brasero_data_vfs_loading_node):
	* src/brasero-file-node.c (brasero_file_node_get_uri_name):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-data-vfs.c
   trunk/src/brasero-file-node.c

Modified: trunk/src/brasero-data-vfs.c
==============================================================================
--- trunk/src/brasero-data-vfs.c	(original)
+++ trunk/src/brasero-data-vfs.c	Wed Aug 20 11:50:50 2008
@@ -727,7 +727,6 @@
 	if (!node->is_reloading) {
 		gchar *name;
 		GFile *vfs_uri;
-		gchar *unescaped_name;
 
 		/* g_path_get_basename is not comfortable with uri related
 		 * to the root directory so check that before */
@@ -735,9 +734,10 @@
 		name = g_file_get_basename (vfs_uri);
 		g_object_unref (vfs_uri);
 
-		unescaped_name = g_uri_unescape_string (name, NULL);
-		g_free (name);
-		name = unescaped_name;
+
+		/* NOTE and reminder names are already unescaped; the following
+		 * is not needed: unescaped_name = g_uri_unescape_string (name,
+		 * NULL); */
 
 		if (!name)
 			return TRUE;

Modified: trunk/src/brasero-file-node.c
==============================================================================
--- trunk/src/brasero-file-node.c	(original)
+++ trunk/src/brasero-file-node.c	Wed Aug 20 11:50:50 2008
@@ -777,7 +777,7 @@
 gchar *
 brasero_file_node_get_uri_name (const gchar *uri)
 {
-	gchar *unescaped_name;
+	gchar *utf8_name;
 	GFile *vfs_uri;
 	gchar *name;
 
@@ -787,18 +787,18 @@
 	name = g_file_get_basename (vfs_uri);
 	g_object_unref (vfs_uri);
 
-	unescaped_name = g_uri_unescape_string (name, NULL);
-	g_free (name);
+	/* NOTE and reminder names are already unescaped; the following is not
+	 * needed: unescaped_name = g_uri_unescape_string (name, NULL); */
 
 	/* NOTE: a graft should be added for non utf8 name since we
 	 * modify them; in fact we use this function only in the next
 	 * one which creates only grafted nodes. */
-	name = brasero_file_node_validate_utf8_name (unescaped_name);
-	if (name) {
-		g_free (unescaped_name);
-		return name;
+	utf8_name = brasero_file_node_validate_utf8_name (name);
+	if (utf8_name) {
+		g_free (name);
+		return utf8_name;
 	}
-	return unescaped_name;
+	return name;
 }
 
 BraseroFileNode *