Index: gnome-vfs-uri.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-uri.c,v
retrieving revision 1.119
diff -u -p -r1.119 gnome-vfs-uri.c
--- gnome-vfs-uri.c	15 Oct 2004 18:10:13 -0000	1.119
+++ gnome-vfs-uri.c	1 Jan 2005 10:48:04 -0000
@@ -1742,18 +1742,20 @@ gnome_vfs_uri_extract_short_name (const 
 	short_path_name = gnome_vfs_unescape_string (escaped_short_path_name, "/");
 	g_free (escaped_short_path_name);
 
-	host_name = NULL;
 	if (short_path_name != NULL
-		&& strcmp (short_path_name, GNOME_VFS_URI_PATH_STR) == 0) {
-		host_name = gnome_vfs_uri_get_host_name (uri);
-	}
-
-	if (host_name == NULL || strlen (host_name) == 0) {
+		&& strcmp (short_path_name, GNOME_VFS_URI_PATH_STR) != 0) {
 		return short_path_name;
 	}
 
-	g_free (short_path_name);
-	return g_strdup (host_name);
+	host_name = gnome_vfs_uri_get_host_name (uri);
+
+	if (host_name != NULL && strlen (host_name) != 0) {
+		g_free (short_path_name);
+		return g_strdup (host_name);
+	} else {
+		return (short_path_name != NULL) ? short_path_name :
+			g_strdup (gnome_vfs_uri_get_path (uri));
+	}
 }
 
 /**
