=== modified file 'gnome-screenshot/screenshot-dialog.c'
--- gnome-screenshot/screenshot-dialog.c
+++ gnome-screenshot/screenshot-dialog.c
@@ -277,9 +277,11 @@
   file_name = gtk_entry_get_text (GTK_ENTRY (dialog->filename_entry));
 
   tmp = g_filename_from_utf8 (file_name, -1, NULL, NULL, NULL);
-  uri = g_build_filename (folder, tmp, NULL);
+  file_name = gnome_vfs_escape_host_and_path_string (tmp);
+  uri = g_build_filename (folder, file_name, NULL);
   g_free (folder);
   g_free (tmp);
+  g_free (file_name);
 
   return uri;
 }

=== modified file 'gnome-screenshot/screenshot-save.c'
--- gnome-screenshot/screenshot-save.c
+++ gnome-screenshot/screenshot-save.c
@@ -236,7 +236,7 @@
   g_assert (filename);
   g_assert (g_utf8_validate (filename, -1, NULL));
 
-  retval = g_strdup (filename);
+  retval = gnome_vfs_escape_host_and_path_string (filename);
 
   for (p = retval; *p != '\000'; p = g_utf8_next_char (p))
     {

