diff -Npur nautilus-old/libnautilus-private/nautilus-file.c nautilus-new/libnautilus-private/nautilus-file.c
--- nautilus-old/libnautilus-private/nautilus-file.c	2009-03-19 18:27:36.000000000 +0800
+++ nautilus-new/libnautilus-private/nautilus-file.c	2009-03-19 18:28:13.000000000 +0800
@@ -523,7 +523,7 @@ nautilus_file_get_internal (GFile *locat
 	if (self_owned && directory != NULL) {
 		basename = nautilus_directory_get_name_for_self_as_new_file (directory);
 	} else {
-		basename = g_file_get_basename (location);
+		basename = g_path_get_basename (g_file_get_uri (location));
 	}
 	/* Check to see if it's a file that's already known. */
 	if (directory == NULL) {
