Index: gedit/gedit-file-selector-util.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/gedit-file-selector-util.c,v
retrieving revision 1.27
diff -u -p -r1.27 gedit-file-selector-util.c
--- gedit/gedit-file-selector-util.c	25 Jun 2004 15:05:00 -0000	1.27
+++ gedit/gedit-file-selector-util.c	1 Aug 2004 12:17:51 -0000
@@ -306,7 +306,7 @@ analyze_response (GtkFileChooser *choose
 
 		g_free (uri);
 
-		return file_name;
+		return uri;
 	} 
 
 	return NULL;
Index: gedit/gedit-file.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/gedit-file.c,v
retrieving revision 1.69
diff -u -p -r1.69 gedit-file.c
--- gedit/gedit-file.c	19 Jul 2004 15:21:17 -0000	1.69
+++ gedit/gedit-file.c	1 Aug 2004 12:17:53 -0000
@@ -330,7 +330,7 @@ gedit_file_save (GeditMDIChild* child, g
 gboolean
 gedit_file_save_as (GeditMDIChild *child)
 {
-	gchar *file;
+	gchar *file_uri;
 	gboolean ret = FALSE;
 	GeditDocument *doc;
 	GtkWidget *view;
@@ -396,7 +396,7 @@ gedit_file_save_as (GeditMDIChild *child
 
 	encoding = gedit_document_get_encoding (doc);
 
-	file = gedit_file_selector_save (
+	file_uri = gedit_file_selector_save (
 			GTK_WINDOW (bonobo_mdi_get_active_window (BONOBO_MDI (gedit_mdi))),
 			FALSE,
 		        _("Save as..."), 
@@ -404,54 +404,43 @@ gedit_file_save_as (GeditMDIChild *child
 			fname,
 			untitled_name,
 			&encoding);
-	
+
 	g_free (fname);
 	g_free (untitled_name);
 	g_free (path);
 
-	if (file != NULL) 
+	if (file_uri != NULL) 
 	{
-		gchar *uri;
 		gchar *file_utf8;
 
-		uri = eel_make_uri_from_shell_arg (file);
-		g_return_val_if_fail (uri != NULL, FALSE);
-
-		file_utf8 = eel_format_uri_for_display (uri);
+		file_utf8 = eel_format_uri_for_display (file_uri);
 		if (file_utf8 != NULL)
 			gedit_utils_flash_va (_("Saving document \"%s\"..."), file_utf8);
 		
-		ret = gedit_file_save_as_real (uri, encoding, child);
-		
+		ret = gedit_file_save_as_real (file_uri, encoding, child);
+
 		if (ret)
 		{			
 			if (gedit_default_path != NULL)
 				g_free (gedit_default_path);
 
-			gedit_default_path = get_dirname_from_uri (file);
+			gedit_default_path = get_dirname_from_uri (file_uri);
 
 			if (file_utf8 != NULL)
-			{
 				gedit_utils_flash_va (_("The document \"%s\" has been saved."), 
 						      file_utf8);
-			}
 		}
 		else
 		{
 			if (file_utf8 != NULL)
-			{
 				gedit_utils_flash_va (_("The document \"%s\" has not been saved."),
 						      file_utf8);
-			}
 		}
 
-		gedit_debug (DEBUG_FILE, "File: %s", file);
-		g_free (uri);
-		g_free (file);
+		gedit_debug (DEBUG_FILE, "File: %s", file_uri);
 
-		if (file_utf8 != NULL)
-			g_free (file_utf8);
-		
+		g_free (file_uri);
+		g_free (file_utf8);
 	}
 
 	return ret;
