Moved functions to gnome-vfs.

	* components/music/nautilus-music-view.c: (play_current_file),
	(nautilus_music_view_update_from_uri):
	* libnautilus-extensions/nautilus-bookmark.c:
	(nautilus_bookmark_uri_known_not_to_exist):
	* libnautilus-extensions/nautilus-directory-background.c:
	(theme_image_path_to_uri),
	(nautilus_directory_background_read_desktop_settings),
	(nautilus_directory_background_write_desktop_settings):
	* libnautilus-extensions/nautilus-file-utilities.c:
	(nautilus_get_user_main_directory), (nautilus_is_remote_uri):
	* libnautilus-extensions/nautilus-gdk-pixbuf-extensions.c:
	(nautilus_gdk_pixbuf_load):
	* libnautilus-extensions/nautilus-icon-factory.c:
	(make_thumbnail_path), (path_represents_svg_image),
	(load_specific_image), (nautilus_icon_factory_make_thumbnails):
	* libnautilus-extensions/nautilus-link-set.c: (expand_uri):
	* libnautilus-extensions/nautilus-link.c: (nautilus_link_create),
	(nautilus_link_set_icon), (nautilus_link_set_link_uri),
	(nautilus_link_set_type), (nautilus_link_get_root_property),
	(make_local_path), (nautilus_link_get_image_uri):
	* libnautilus-extensions/nautilus-preferences-item.c:
	(add_icon_themes):
	* libnautilus-extensions/nautilus-program-choosing.c:
	(nautilus_launch_application_parented):
	* libnautilus-extensions/nautilus-trash-directory.c:
	(get_volume_vfs_uri_if_writable):
	* libnautilus-extensions/nautilus-volume-monitor.c:
	(mount_volume_mount):
	* src/file-manager/fm-desktop-icon-view.c:
	(startup_create_mount_links), (volume_mounted_callback),
	(place_home_directory), (get_local_path):
	* src/file-manager/fm-directory-view.c: (activate_callback):
	* src/file-manager/fm-icon-view.c: (play_file):
	* src/file-manager/fm-properties-window.c:
	(get_and_ref_file_to_display):
	* src/nautilus-desktop-window.c: (nautilus_desktop_window_new):
	* src/nautilus-property-browser.c:
	(nautilus_property_browser_drag_data_get), (remove_background),
	(remove_emblem), (emblem_image_file_changed),
	(add_background_to_browser), (emblem_dialog_clicked),
	(make_properties_from_directory):
	* src/nautilus-sidebar.c: (map_local_data_file),
	(uri_is_local_image):
	* src/nautilus-theme-selector.c: (populate_list_with_themes):
	* src/nautilus-view-frame-bonobo-embeddable.c:
	(bonobo_subdoc_load_location):
	* src/nautilus-window.c: (nautilus_window_go_home):
	Changed to use local path functions from gnome-vfs now that
	they are moved there from Nautilus.

	* libnautilus-extensions/nautilus-file-utilities.h:
	* libnautilus-extensions/nautilus-file-utilities.c:
	Removed the local path functions since they are in gnome-vfs
	now and all callers have been changed to use those.

1 files changed, 6 insertions, 65 deletions

diff --git a/libnautilus-extensions/nautilus-file-utilities.c b/libnautilus-extensions/nautilus-file-utilities.c
index a56666bfa..1c62fa511 100644
--- a/libnautilus-extensions/nautilus-file-utilities.c
+++ b/libnautilus-extensions/nautilus-file-utilities.c
@@ -324,8 +324,8 @@ nautilus_get_user_main_directory (void)
 					       NAUTILUS_USER_MAIN_DIRECTORY_NAME);
 												
 	if (!g_file_exists (user_main_directory)) {			
-		source_directory_uri = nautilus_get_uri_from_local_path (NAUTILUS_DATADIR);
-		destination_directory_uri = nautilus_get_uri_from_local_path (g_get_home_dir());
+		source_directory_uri = gnome_vfs_get_uri_from_local_path (NAUTILUS_DATADIR);
+		destination_directory_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir());
 		source_name_list = g_list_prepend (NULL, "top");
 		destination_name_list = g_list_prepend (NULL, NAUTILUS_USER_MAIN_DIRECTORY_NAME);
 		
@@ -348,9 +348,9 @@ nautilus_get_user_main_directory (void)
 		}
 					
 		/* assign a custom image for the directory icon */
-		file_uri = nautilus_get_uri_from_local_path (user_main_directory);
+		file_uri = gnome_vfs_get_uri_from_local_path (user_main_directory);
 		temp_str = nautilus_pixmap_file ("nautilus-logo.png");
-		image_uri = nautilus_get_uri_from_local_path (temp_str);
+		image_uri = gnome_vfs_get_uri_from_local_path (temp_str);
 		g_free (temp_str);
 		
 		file = nautilus_file_get (file_uri);
@@ -365,7 +365,7 @@ nautilus_get_user_main_directory (void)
 		
 		/* now do the same for the about file */
 		temp_str = g_strdup_printf ("%s/About.html", user_main_directory);
-		file_uri = nautilus_get_uri_from_local_path (temp_str);
+		file_uri = gnome_vfs_get_uri_from_local_path (temp_str);
 		g_free (temp_str);
 		
 		file = nautilus_file_get (file_uri);
@@ -407,65 +407,6 @@ nautilus_get_pixmap_directory (void)
 	return pixmap_directory;
 }
 
-/**
- * nautilus_get_local_path_from_uri:
- * 
- * Return a local path for a file:// URI.
- *
- * Return value: the local path or NULL on error.
- **/
-char *
-nautilus_get_local_path_from_uri (const char *uri)
-{
-	char *result, *unescaped_uri;
-
-	if (uri == NULL) {
-		return NULL;
-	}
-
-	unescaped_uri = gnome_vfs_unescape_string (uri, "/");
-
-	if (unescaped_uri == NULL) {
-		return NULL;
-	}
-
-	if (nautilus_istr_has_prefix (unescaped_uri, "file://")) {
-		result = g_strdup (unescaped_uri + 7);
-	} else if (unescaped_uri[0] == '/') {
-		result = g_strdup (unescaped_uri);
-	} else {
-		result = NULL;
-	}
-
-	g_free (unescaped_uri);
-
-	return result;
-}
-
-/**
- * nautilus_get_uri_from_local_path:
- * 
- * Return a file:// URI for a local path.
- *
- * Return value: the URI (NULL for some bad errors).
- **/
-char *
-nautilus_get_uri_from_local_path (const char *local_path)
-{
-	char *escaped_path, *result;
-	
-	if (local_path == NULL) {
-		return NULL;
-	}
-
-	g_return_val_if_fail (local_path[0] == '/', NULL);
-
-	escaped_path = gnome_vfs_escape_path_string (local_path);
-	result = g_strconcat ("file://", escaped_path, NULL);
-	g_free (escaped_path);
-	return result;
-}
-
 /* convenience routine to use gnome-vfs to test if a string is a remote uri */
 gboolean
 nautilus_is_remote_uri (const char *uri)
@@ -473,7 +414,7 @@ nautilus_is_remote_uri (const char *uri)
 	gboolean is_local;
 	GnomeVFSURI *vfs_uri;
 	
-	vfs_uri = gnome_vfs_uri_new(uri);
+	vfs_uri = gnome_vfs_uri_new (uri);
 	is_local = gnome_vfs_uri_is_local (vfs_uri);
 	gnome_vfs_uri_unref(vfs_uri);
 	return !is_local;