Re: [Nautilus-list] [PATCH] Custom icon patch

[Anders Carlsson <andersca gnu org>]

And it's always good to attach the file :)

//andersca
andersca gnu org

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.4640
diff -u -r1.4640 ChangeLog
--- ChangeLog	2001/06/04 02:26:41	1.4640
+++ ChangeLog	2001/06/04 19:19:06
@@ -1,3 +1,9 @@
+2001-06-04  Anders Carlsson  <andersca codefactory se>
+
+	* src/nautilus-sidebar.c (receive_dropped_uri_list): Escape 
+	the uri to prevent extended characters from being set
+	as metadata since libxml creates extra entity nodes for those.
+
 2001-06-03  Seth Nickell  <snickell stanford edu>
 
 	Added Ben FrantzDale's <bfrantzdale hmc edu> revisions
Index: src/nautilus-sidebar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-sidebar.c,v
retrieving revision 1.183
diff -u -r1.183 nautilus-sidebar.c
--- src/nautilus-sidebar.c	2001/05/16 06:27:55	1.183
+++ src/nautilus-sidebar.c	2001/06/04 19:19:06
@@ -670,6 +670,7 @@
 {
 	char **uris;
 	gboolean exactly_one;
+	char *escaped_uri;
 	GtkWindow *window;
 	
 	uris = g_strsplit (selection_data->data, "\r\n", 0);
@@ -708,16 +709,21 @@
 		}
 		
 		if (uri_is_local_image (uris[0])) {
+			/* We escape the uri to get rid of extended characters that confuse libxml */
+			escaped_uri = gnome_vfs_escape_host_and_path_string (uris[0]);
+
 			if (sidebar->details->file != NULL) {
 				nautilus_file_set_metadata (sidebar->details->file,
 							    NAUTILUS_METADATA_KEY_CUSTOM_ICON,
 							    NULL,
-							    uris[0]);
+							    escaped_uri);
 				nautilus_file_set_metadata (sidebar->details->file,
 							    NAUTILUS_METADATA_KEY_ICON_SCALE,
 							    NULL,
 							    NULL);
 			}
+
+			g_free (escaped_uri);
 		} else {	
 			if (eel_is_remote_uri (uris[0])) {
 				eel_show_error_dialog (