nautilus-sendto r336 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Sun Jul 20 22:09:39 2008
New Revision: 336
URL: http://svn.gnome.org/viewvc/nautilus-sendto?rev=336&view=rev

Log:
2008-07-20  Bastien Nocera  <hadess hadess net>

	* src/nautilus-sendto-command.c (nautilus_sendto_init):
	Make sure ampersands are escaped even if we're passed a URI
	(Closes: #543327)



Modified:
   trunk/ChangeLog
   trunk/src/nautilus-sendto-command.c

Modified: trunk/src/nautilus-sendto-command.c
==============================================================================
--- trunk/src/nautilus-sendto-command.c	(original)
+++ trunk/src/nautilus-sendto-command.c	Sun Jul 20 22:09:39 2008
@@ -693,8 +693,15 @@
 		filename = filenames[i];
  
  		if (g_str_has_prefix (filename, "file://")) {
- 			file_list = g_list_prepend (file_list,
- 					g_strdup (filename));
+ 			char *escaped;
+
+			/* Make sure URIs don't contain ampersands */
+ 			escaped = escape_ampersands (filename);
+ 			if (escaped == NULL)
+				file_list = g_list_prepend (file_list,
+							    g_strdup (filename));
+			else
+				file_list = g_list_prepend (file_list, escaped);
  			path = g_filename_from_uri (filename, NULL, NULL);
  			if (path != NULL
  			    && g_file_test (path, G_FILE_TEST_IS_DIR)) {