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, 5 insertions, 9 deletions

diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index 4ede64741..923484501 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -25,21 +25,17 @@
 #include <config.h>
 #include "nautilus-bookmark.h"
 
+#include "nautilus-gtk-macros.h"
+#include "nautilus-icon-factory.h"
+#include "nautilus-string.h"
 #include <gtk/gtkaccellabel.h>
 #include <gtk/gtksignal.h>
-
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gtkpixmapmenuitem.h>
-
-#include "nautilus-file-utilities.h"
-#include "nautilus-gtk-macros.h"
-#include "nautilus-icon-factory.h"
-#include "nautilus-string.h"
-
 #include <libgnomevfs/gnome-vfs-types.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
-
+#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
 
 enum {
@@ -466,7 +462,7 @@ nautilus_bookmark_uri_known_not_to_exist (NautilusBookmark *bookmark)
 	gboolean exists;
 
 	/* Convert to a path, returning FALSE if not local. */
-	path_name = nautilus_get_local_path_from_uri (bookmark->details->uri);
+	path_name = gnome_vfs_get_local_path_from_uri (bookmark->details->uri);
 	if (path_name == NULL) {
 		return FALSE;
 	}