brasero r1155 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sun Aug 24 12:16:26 2008
New Revision: 1155
URL: http://svn.gnome.org/viewvc/brasero?rev=1155&view=rev

Log:
	Fix problem with URI handling in data project triggering various bugs

	* 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_node_loaded),
	(brasero_data_project_file_added),
	(brasero_data_project_file_update_URI),
	(brasero_data_project_file_graft):


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

Modified: trunk/src/brasero-audio-disc.c
==============================================================================
--- trunk/src/brasero-audio-disc.c	(original)
+++ trunk/src/brasero-audio-disc.c	Sun Aug 24 12:16:26 2008
@@ -4075,7 +4075,9 @@
 		if (dir->uri && name) {
 			gchar *escaped_name;
 
-			escaped_name = g_uri_escape_string (name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
+			escaped_name = g_uri_escape_string (name,
+							    G_URI_RESERVED_CHARS_ALLOWED_IN_PATH,
+							    FALSE);
 			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	Sun Aug 24 12:16:26 2008
@@ -440,7 +440,9 @@
 			break;
 
 		/* the + 1 is for the separator */
-		escaped_name = g_uri_escape_string (BRASERO_FILE_NODE_NAME (node), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
+		escaped_name = g_uri_escape_string (BRASERO_FILE_NODE_NAME (node),
+						    G_URI_RESERVED_CHARS_ALLOWED_IN_PATH,
+						    FALSE);
 		uri_len += strlen (escaped_name) + 1;
 		list = g_slist_prepend (list, escaped_name);
 	}
@@ -1774,7 +1776,6 @@
 
 	/* signal the changes */
 	brasero_data_project_node_changed (self, node);
-
 	if (size_changed)
 		g_signal_emit (self,
 			       brasero_data_project_signals [SIZE_CHANGED_SIGNAL],
@@ -3025,7 +3026,9 @@
 
 	/* get the new URI */
 	parent_uri = brasero_data_project_node_to_uri (BRASERO_DATA_PROJECT (monitor), parent);
-	escaped_name = g_uri_escape_string (name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
+	escaped_name = g_uri_escape_string (name,
+					    G_URI_RESERVED_CHARS_ALLOWED_IN_PATH,
+					    FALSE);
 	uri = g_strconcat (parent_uri, G_DIR_SEPARATOR_S, escaped_name, NULL);
 	g_free (escaped_name);
 	g_free (parent_uri);
@@ -3063,7 +3066,9 @@
 	uri_node = graft->node;
 
 	/* get the new uri */
-	escaped_name = g_uri_escape_string (name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
+	escaped_name = g_uri_escape_string (name,
+					    G_URI_RESERVED_CHARS_ALLOWED_IN_PATH,
+					    FALSE);
 	uri = g_build_path (G_DIR_SEPARATOR_S, parent_uri, escaped_name, NULL);
 	g_free (escaped_name);
 
@@ -3139,7 +3144,9 @@
 	parent = g_path_get_dirname (uri);
 	g_free (uri);
 
-	escaped_name = g_uri_escape_string (real_name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
+	escaped_name = g_uri_escape_string (real_name,
+					    G_URI_RESERVED_CHARS_ALLOWED_IN_PATH,
+					    FALSE);
 	uri = g_strconcat (parent, G_DIR_SEPARATOR_S, escaped_name, NULL);
 	g_free (escaped_name);
 	g_free (parent);