brasero r1152 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sat Aug 23 13:16:19 2008
New Revision: 1152
URL: http://svn.gnome.org/viewvc/brasero?rev=1152&view=rev

Log:
	Make brasero handles uris better by avoiding some escaping

	* src/brasero-audio-disc.c (brasero_audio_disc_inotify_monitor_cb):
	* src/brasero-data-project.c (brasero_data_project_node_to_uri),
	(brasero_data_project_file_added),
	(brasero_data_project_file_update_URI),
	(brasero_data_project_file_graft):
	* src/brasero-project.c (_read_graft_point), (_read_audio_track),
	(_save_audio_track_xml), (_save_data_track_xml):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-audio-disc.c
   trunk/src/brasero-data-project.c
   trunk/src/brasero-project.c

Modified: trunk/src/brasero-audio-disc.c
==============================================================================
--- trunk/src/brasero-audio-disc.c	(original)
+++ trunk/src/brasero-audio-disc.c	Sat Aug 23 13:16:19 2008
@@ -4075,7 +4075,7 @@
 		if (dir->uri && name) {
 			gchar *escaped_name;
 
-			escaped_name = g_uri_escape_string (name, NULL, TRUE);
+			escaped_name = g_uri_escape_string (name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
 			monitored = g_strconcat (dir->uri, "/", name, NULL);
 			g_free (escaped_name);
 			g_free (name);

Modified: trunk/src/brasero-data-project.c
==============================================================================
--- trunk/src/brasero-data-project.c	(original)
+++ trunk/src/brasero-data-project.c	Sat Aug 23 13:16:19 2008
@@ -440,7 +440,7 @@
 			break;
 
 		/* the + 1 is for the separator */
-		escaped_name = g_uri_escape_string (BRASERO_FILE_NODE_NAME (node), NULL, TRUE);
+		escaped_name = g_uri_escape_string (BRASERO_FILE_NODE_NAME (node), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
 		uri_len += strlen (escaped_name) + 1;
 		list = g_slist_prepend (list, escaped_name);
 	}
@@ -3025,7 +3025,7 @@
 
 	/* get the new URI */
 	parent_uri = brasero_data_project_node_to_uri (BRASERO_DATA_PROJECT (monitor), parent);
-	escaped_name = g_uri_escape_string (name, NULL, TRUE);
+	escaped_name = g_uri_escape_string (name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
 	uri = g_strconcat (parent_uri, G_DIR_SEPARATOR_S, escaped_name, NULL);
 	g_free (escaped_name);
 	g_free (parent_uri);
@@ -3063,7 +3063,7 @@
 	uri_node = graft->node;
 
 	/* get the new uri */
-	escaped_name = g_uri_escape_string (name, NULL, TRUE);
+	escaped_name = g_uri_escape_string (name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
 	uri = g_build_path (G_DIR_SEPARATOR_S, parent_uri, escaped_name, NULL);
 	g_free (escaped_name);
 
@@ -3139,7 +3139,7 @@
 	parent = g_path_get_dirname (uri);
 	g_free (uri);
 
-	escaped_name = g_uri_escape_string (real_name, NULL, TRUE);
+	escaped_name = g_uri_escape_string (real_name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
 	uri = g_strconcat (parent, G_DIR_SEPARATOR_S, escaped_name, NULL);
 	g_free (escaped_name);
 	g_free (parent);

Modified: trunk/src/brasero-project.c
==============================================================================
--- trunk/src/brasero-project.c	(original)
+++ trunk/src/brasero-project.c	Sat Aug 23 13:16:19 2008
@@ -1816,7 +1816,7 @@
 			uri = xmlNodeListGetString (project,
 						    graft->xmlChildrenNode,
 						    1);
-			retval->uri = xmlURIUnescapeString ((char*) uri, 0, NULL);
+			retval->uri = g_uri_unescape_string ((char *)uri, NULL);
 			g_free (uri);
 			if (!retval->uri)
 				goto error;
@@ -1932,7 +1932,7 @@
 				goto error;
 
 			song = g_new0 (BraseroDiscSong, 1);
-			song->uri = xmlURIUnescapeString ((gchar*) uri, 0, NULL);
+			song->uri = g_uri_unescape_string ((char *) uri, NULL);
 
 			/* to know if this info was set or not */
 			song->start = -1;
@@ -2390,7 +2390,7 @@
 		gchar *end;
 
 		song = iter->data;
-		escaped = xmlURIEscapeStr ((xmlChar *) song->uri, NULL);
+		escaped = (unsigned char *) g_uri_escape_string (song->uri, NULL, FALSE);
 		success = xmlTextWriterWriteElement (project,
 						    (xmlChar *) "uri",
 						     escaped);
@@ -2460,7 +2460,7 @@
 		if (graft->uri) {
 			xmlChar *escaped;
 
-			escaped = xmlURIEscapeStr ((xmlChar *) graft->uri, NULL);
+			escaped = (unsigned char *) g_uri_escape_string (graft->uri, NULL, FALSE);
 			success = xmlTextWriterWriteElement (project, (xmlChar *) "uri", escaped);
 			g_free (escaped);
 			if (success < 0)