Move vfs extensions to eel.

	* libnautilus-extensions/nautilus-file-utilities.c:
	* libnautilus-extensions/nautilus-file-utilities.h:
	Move vfs extensions to eel.

	* components/services/install-view/nautilus-service-install-view.c:
	* components/services/install/server/main.c:
	* components/services/inventory/eazel-inventory-collect-hardware.c:
	(add_info):
	* components/services/inventory/eazel-inventory-service.c:
	(impl_Trilobite_Eazel_Inventory_upload):
	* components/text/nautilus-text-view.c: (handle_service_menu_item):
	* components/tree/nautilus-tree-view.c: (select_current_location),
	(tree_load_location_callback), (got_activation_uri_callback):
	* libnautilus-extensions/nautilus-bookmark.c:
	(nautilus_bookmark_compare_with), (nautilus_bookmark_compare_uris),
	(bookmark_file_changed_callback):
	* libnautilus-extensions/nautilus-directory-async.c:
	(top_left_cancel), (activation_uri_cancel), (top_left_start),
	(activation_uri_start):
	* libnautilus-extensions/nautilus-directory-private.h:
	* libnautilus-extensions/nautilus-directory.c:
	(nautilus_directory_make_uri_canonical), (nautilus_directory_new),
	(nautilus_directory_notify_files_moved),
	(nautilus_self_check_directory):
	* libnautilus-extensions/nautilus-drag.c:
	(nautilus_drag_items_in_trash),
	(nautilus_drag_default_drop_action_for_icons):
	* libnautilus-extensions/nautilus-file-operations.c:
	(format_and_ellipsize_uri_for_dialog),
	(nautilus_file_operations_copy_move):
	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_get_internal),
	(nautilus_file_get_parent_uri_for_display),
	(nautilus_file_can_rename), (nautilus_file_get_uri_scheme),
	(nautilus_file_is_in_trash), (nautilus_self_check_file):
	* libnautilus-extensions/nautilus-icon-dnd.c:
	(nautilus_icon_container_selection_items_local):
	* libnautilus-extensions/nautilus-icon-factory.c:
	(nautilus_icon_factory_get_icon_name_for_file),
	(nautilus_icon_factory_get_emblem_icons_for_file):
	* libnautilus-extensions/nautilus-link.c:
	(nautilus_link_local_get_image_uri):
	* libnautilus-extensions/nautilus-metafile.c:
	(construct_private_metafile_vfs_uri), (metafile_read_cancel),
	(metafile_read_restart):
	* libnautilus-extensions/nautilus-tabs.c:
	* libnautilus-extensions/nautilus-theme.c:
	* libnautilus-extensions/nautilus-thumbnails.c:
	(make_thumbnail_uri):
	* libnautilus-extensions/nautilus-trash-file.c:
	(nautilus_trash_file_initialize):
	* libnautilus-extensions/nautilus-trash-monitor.c:
	(nautilus_trash_files_changed_callback),
	(nautilus_trash_monitor_initialize):
	* src/file-manager/fm-desktop-icon-view.c:
	(update_trash_link_and_delete_copies):
	* src/file-manager/fm-directory-view.c: (show_trash_callback),
	(trash_or_delete_files_common),
	(fm_directory_view_trash_or_delete_files),
	(fm_directory_view_move_copy_items):
	* src/file-manager/fm-properties-window.c:
	(is_merged_trash_directory):
	* src/nautilus-application.c:
	(nautilus_make_uri_list_from_shell_strv):
	* src/nautilus-first-time-druid.c: (read_file_handle_cancel_cover),
	(initiate_file_download):
	* src/nautilus-location-bar.c: (try_to_expand_path),
	(nautilus_location_bar_set_location),
	(nautilus_location_bar_get_location),
	(nautilus_location_bar_update_label):
	* src/nautilus-profiler.c:
	(nautilus_profiler_bonobo_ui_report_callback):
	* src/nautilus-property-browser.c: (add_pattern_to_browser),
	(emblem_dialog_clicked):
	* src/nautilus-sidebar.c: (receive_dropped_uri_list):
	* src/nautilus-theme-selector.c: (add_theme_to_icons):
	* src/nautilus-window-manage-views.c: (set_displayed_location),
	(check_bookmark_location_matches), (handle_go_elsewhere),
	(viewed_file_changed_callback), (determined_initial_view_callback),
	(open_location_prefer_existing_window_callback),
	(report_redirect_callback):
	* src/nautilus-window-menus.c: (show_bogus_bookmark_window):
	Update for vfs extensions move to eel.  Also cleanup the #include
	state of some of these files.  Removed unused #includes.  Remove
	some cut-n-paste code in services components and use the
	extensions in eel directly.

14 files changed, 167 insertions, 161 deletions

diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index a42de2c74..e76a835c9 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -26,12 +26,19 @@
 #include <config.h>
 #include "fm-desktop-icon-view.h"
 
+#include <X11/Xatom.h>
+#include <bonobo/bonobo-ui-util.h>
 #include <ctype.h>
 #include <dirent.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
 #include <fcntl.h>
-#include <bonobo/bonobo-ui-util.h>
 #include <gdk/gdkx.h>
-#include <X11/Xatom.h>
 #include <gtk/gtkcheckmenuitem.h>
 #include <libgnome/gnome-dentry.h>
 #include <libgnome/gnome-i18n.h>
@@ -44,16 +51,10 @@
 #include <libnautilus-extensions/nautilus-file-changes-queue.h>
 #include <libnautilus-extensions/nautilus-file-operations.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gnome-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-trash-monitor.h>
 #include <libnautilus-extensions/nautilus-volume-monitor.h>
 #include <limits.h>
@@ -911,7 +912,7 @@ update_trash_link_and_delete_copies (void)
 	/* Check for trash link */
 	if (update_link_and_delete_copies (nautilus_link_local_is_trash_link,
 					   TRASH_LINK_NAME,
-					   NAUTILUS_TRASH_URI)) {
+					   EEL_TRASH_URI)) {
 		return;
 	}
 
@@ -919,7 +920,7 @@ update_trash_link_and_delete_copies (void)
 	nautilus_link_local_create (desktop_path,
 				    TRASH_LINK_NAME,
 				    "trash-empty.png", 
-				    NAUTILUS_TRASH_URI,
+				    EEL_TRASH_URI,
 				    NULL,
 				    NAUTILUS_LINK_TRASH);				    				    
 	g_free (desktop_path);
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index a9ddfbe03..1a3b1d8e0 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -33,8 +33,16 @@
 #include "fm-error-reporting.h"
 #include "fm-properties-window.h"
 #include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-zoomable.h>
 #include <bonobo/bonobo-win.h>
+#include <bonobo/bonobo-zoomable.h>
+#include <eel/eel-background.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
 #include <gtk/gtkcheckmenuitem.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenu.h>
@@ -49,7 +57,6 @@
 #include <libgnomevfs/gnome-vfs-result.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus-extensions/nautilus-directory-background.h>
 #include <libnautilus-extensions/nautilus-directory.h>
@@ -57,18 +64,12 @@
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-operations.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gnome-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-trash-monitor.h>
 #include <libnautilus-extensions/nautilus-view-identifier.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
@@ -858,7 +859,7 @@ show_trash_callback (BonoboUIComponent *component,
 
 	view = FM_DIRECTORY_VIEW (callback_data);          
 
-	open_location (view, NAUTILUS_TRASH_URI, RESPECT_PREFERENCE);
+	open_location (view, EEL_TRASH_URI, RESPECT_PREFERENCE);
 }
 
 static void
@@ -2849,7 +2850,7 @@ trash_or_delete_files_common (const GList *file_uris,
 		
 		if (fm_directory_view_can_move_uri_to_trash (view, file_uri)) {
 			moveable_uris = g_list_prepend (moveable_uris, g_strdup (file_uri));
-		} else if (nautilus_uri_is_in_trash (file_uri)) {
+		} else if (eel_uri_is_in_trash (file_uri)) {
 			in_trash_uris = g_list_prepend (in_trash_uris, g_strdup (file_uri));
 		} else {
 			unmoveable_uris = g_list_prepend (unmoveable_uris, g_strdup (file_uri));
@@ -2896,7 +2897,7 @@ fm_directory_view_trash_or_delete_files (const GList *files,
 	}
 	
 	file_uris = g_list_reverse (file_uris);
-	trash_or_delete_files_common (file_uris, NULL, NAUTILUS_TRASH_URI,
+	trash_or_delete_files_common (file_uris, NULL, EEL_TRASH_URI,
 				      GDK_ACTION_MOVE, view);					 
 	eel_g_list_free_deep (file_uris);
 }
@@ -5228,7 +5229,7 @@ fm_directory_view_move_copy_items (const GList *item_uris,
 		return;
 	}
 	
-	if (nautilus_uri_is_trash (target_uri)) {
+	if (eel_uri_is_trash (target_uri)) {
 		trash_or_delete_files_common (item_uris, relative_item_points, 
 				              target_uri, copy_action,
 				              view);
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 0c25dafe1..4a7e07eb5 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -26,6 +26,19 @@
 #include "fm-properties-window.h"
 
 #include "fm-error-reporting.h"
+#include <eel/eel-ellipsizing-label.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
+#include <eel/eel-labeled-image.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
+#include <eel/eel-viewport.h>
+#include <eel/eel-wrap-table.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkfilesel.h>
@@ -46,27 +59,14 @@
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-extensions/nautilus-customization-data.h>
-#include <eel/eel-ellipsizing-label.h>
 #include <libnautilus-extensions/nautilus-entry.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
-#include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gnome-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <eel/eel-image.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-undo-signal-handlers.h>
 #include <libnautilus/nautilus-undo.h>
-#include <eel/eel-wrap-table.h>
-#include <eel/eel-labeled-image.h>
-#include <eel/eel-viewport.h>
 #include <string.h>
 
 static GHashTable *windows;
@@ -1355,7 +1355,7 @@ is_merged_trash_directory (NautilusFile *file)
 	gboolean result;
 
 	file_uri = nautilus_file_get_uri (file);
-	result = nautilus_uris_match (file_uri, NAUTILUS_TRASH_URI);
+	result = eel_uris_match (file_uri, EEL_TRASH_URI);
 	g_free (file_uri);
 
 	return result;
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 147bfb889..31d67afba 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -39,26 +39,27 @@
 #include "nautilus-shell.h"
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string-list.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-config.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-client.h>
+#include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-stock.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
+#include <libnautilus-extensions/nautilus-metafile-factory.h>
 #include <libnautilus-extensions/nautilus-sound.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <eel/eel-string-list.h>
 #include <libnautilus-extensions/nautilus-undo-manager.h>
 #include <libnautilus-extensions/nautilus-volume-monitor.h>
-#include <libnautilus-extensions/nautilus-metafile-factory.h>
 #include <liboaf/liboaf.h>
 
 #define FACTORY_IID	     "OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"
@@ -323,7 +324,7 @@ nautilus_make_uri_list_from_shell_strv (const char * const *strv)
 	uri_list->_length = length;
 	uri_list->_buffer = CORBA_sequence_Nautilus_URI_allocbuf (length);
 	for (i = 0; i < length; i++) {
-		translated_uri = nautilus_make_uri_from_shell_arg (strv[i]);
+		translated_uri = eel_make_uri_from_shell_arg (strv[i]);
 		uri_list->_buffer[i] = CORBA_string_dup (translated_uri);
 		g_free (translated_uri);
 		translated_uri = NULL;
diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c
index da652a59a..93b4f4436 100644
--- a/src/nautilus-first-time-druid.c
+++ b/src/nautilus-first-time-druid.c
@@ -28,26 +28,26 @@
 
 #include <ctype.h>
 #include <dirent.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gnome.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <eel/eel-background.h>
-#include <libnautilus-extensions/nautilus-druid-page-eazel.h>
-#include <libnautilus-extensions/nautilus-druid.h>
-#include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <eel/eel-gdk-extensions.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-image.h>
 #include <eel/eel-label.h>
-#include <libnautilus-extensions/nautilus-link.h>
-#include <libnautilus-extensions/nautilus-medusa-support.h>
-#include <libnautilus-extensions/nautilus-preferences.h>
 #include <eel/eel-radio-button-group.h>
+#include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gnome.h>
+#include <libgnomevfs/gnome-vfs.h>
+#include <libnautilus-extensions/nautilus-druid-page-eazel.h>
+#include <libnautilus-extensions/nautilus-druid.h>
+#include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-stock-dialogs.h>
+#include <libnautilus-extensions/nautilus-link.h>
+#include <libnautilus-extensions/nautilus-medusa-support.h>
 #include <nautilus-main.h>
 #include <netdb.h>
 #include <signal.h>
@@ -1382,16 +1382,16 @@ download_callback (GnomeVFSResult result,
 static void
 read_file_handle_cancel_cover (gpointer data)
 {
-	NautilusReadFileHandle *handle;
+	EelReadFileHandle *handle;
 
 	handle = data;
-	nautilus_read_file_cancel (handle);
+	eel_read_file_cancel (handle);
 }
 
 static void
 initiate_file_download (GnomeDruid *druid)
 {
-	NautilusReadFileHandle *handle;
+	EelReadFileHandle *handle;
 	static gboolean prevent_re_entry = FALSE;
 
 	/* We exercise the event loop below, so we need to make sure that 
@@ -1428,7 +1428,7 @@ initiate_file_download (GnomeDruid *druid)
 
 	if (check_network_connectivity ()) {
 		/* initiate the file transfer */
-		handle = nautilus_read_entire_file_async
+		handle = eel_read_entire_file_async
 			(WELCOME_PACKAGE_URI, download_callback, druid);
 		if (handle != NULL) {
 			/* cancel the transfer if the druid goes away */
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index 0b9b0fea9..ec6396754 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -33,6 +33,13 @@
 #include "nautilus-link-set-window.h"
 #include "nautilus-sidebar-tabs.h"
 #include "nautilus-sidebar-title.h"
+#include <eel/eel-background.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gnome-xml/parser.h>
 #include <gtk/gtkcheckmenuitem.h>
@@ -46,24 +53,17 @@
 #include <libgnomevfs/gnome-vfs-types.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-drag.h>
-#include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-file-operations.h>
-#include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <eel/eel-glib-extensions.h>
+#include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-keep-last-vertical-box.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
 #include <libnautilus-extensions/nautilus-sidebar-functions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 #include <libnautilus-extensions/nautilus-trash-monitor.h>
 #include <math.h>
@@ -710,7 +710,7 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 							    NULL);
 			}
 		} else {	
-			if (nautilus_is_remote_uri (uris[0])) {
+			if (eel_is_remote_uri (uris[0])) {
 				eel_show_error_dialog (
 					_("The file that you dropped is not local.  "
 					  "You can only use local images as custom icons."), 
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index f95ac00ea..40c4746bb 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -34,8 +34,13 @@
 #include <config.h>
 #include "nautilus-location-bar.h"
 
-#include "nautilus-window.h"
 #include "nautilus-window-private.h"
+#include "nautilus-window.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkeventbox.h>
 #include <gtk/gtksignal.h>
@@ -45,13 +50,8 @@
 #include <libgnomeui/gnome-stock.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus/nautilus-clipboard.h>
 #include <libnautilus-extensions/nautilus-entry.h>
-#include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
+#include <libnautilus/nautilus-clipboard.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -321,7 +321,7 @@ try_to_expand_path (gpointer callback_data)
 		g_free (user_location);
 		return FALSE;
 	}
-	current_path = nautilus_make_uri_from_input (user_location);
+	current_path = eel_make_uri_from_input (user_location);
 
 	if (!eel_istr_has_prefix (current_path, "file://")) {
 		g_free (user_location);
@@ -717,7 +717,7 @@ nautilus_location_bar_set_location (NautilusNavigationBar *navigation_bar,
 	/* Note: This is called in reaction to external changes, and 
 	 * thus should not emit the LOCATION_CHANGED signal.*/
 	
-	formatted_location = nautilus_format_uri_for_display (location);
+	formatted_location = eel_format_uri_for_display (location);
 	nautilus_entry_set_text (NAUTILUS_ENTRY (bar->details->entry),
 				 formatted_location);
 	g_free (formatted_location);
@@ -748,7 +748,7 @@ nautilus_location_bar_set_location (NautilusNavigationBar *navigation_bar,
  * @bar: A NautilusLocationBar.
  *
  * returns a newly allocated "string" containing the mangled
- * (by nautilus_make_uri_from_input) text that the user typed in...maybe a URI 
+ * (by eel_make_uri_from_input) text that the user typed in...maybe a URI 
  * but not guaranteed.
  *
  **/
@@ -761,7 +761,7 @@ nautilus_location_bar_get_location (NautilusNavigationBar *navigation_bar)
 	bar = NAUTILUS_LOCATION_BAR (navigation_bar);
 	
 	user_location = gtk_editable_get_chars (GTK_EDITABLE (bar->details->entry), 0, -1);
-	best_uri = nautilus_make_uri_from_input (user_location);
+	best_uri = eel_make_uri_from_input (user_location);
 	g_free (user_location);
 	return best_uri;
 }
@@ -778,9 +778,9 @@ nautilus_location_bar_update_label (NautilusLocationBar *bar)
 	char *current_text, *current_location;
 	
 	current_text = gtk_entry_get_text (GTK_ENTRY (bar->details->entry));
-	current_location = nautilus_make_uri_from_input (current_text);
+	current_location = eel_make_uri_from_input (current_text);
 	
-	if (nautilus_uris_match (bar->details->last_location, current_location)) {
+	if (eel_uris_match (bar->details->last_location, current_location)) {
 		gtk_label_set_text (GTK_LABEL (bar->details->label), LOCATION_LABEL);
 	} else {		 
 		gtk_label_set_text (GTK_LABEL (bar->details->label), GO_TO_LABEL);
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 5fcddf519..3592a551f 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -39,6 +39,14 @@
 #include "nautilus-window-manage-views.h"
 #include "nautilus-window-private.h"
 #include <bonobo/bonobo-ui-util.h>
+#include <eel/eel-debug.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
+#include <eel/eel-xml-extensions.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <gtk/gtkmain.h>
@@ -48,17 +56,10 @@
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <eel/eel-debug.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gnome-extensions.h>
-#include <eel/eel-gtk-extensions.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-undo-manager.h>
-#include <eel/eel-xml-extensions.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 
 #ifdef ENABLE_PROFILER
@@ -783,7 +784,7 @@ show_bogus_bookmark_window (BookmarkHolder *holder)
 	char *prompt;
 
 	uri = nautilus_bookmark_get_uri (holder->bookmark);
-	uri_for_display = nautilus_format_uri_for_display (uri);
+	uri_for_display = eel_format_uri_for_display (uri);
 
 	if (holder->prompt_for_removal) {
 		prompt = g_strdup_printf (_("The location \"%s\" does not exist. Do you "
diff --git a/src/nautilus-profiler.c b/src/nautilus-profiler.c
index b8fed6e67..157bfafcf 100644
--- a/src/nautilus-profiler.c
+++ b/src/nautilus-profiler.c
@@ -302,7 +302,7 @@ nautilus_profiler_bonobo_ui_report_callback (BonoboUIComponent *component,
 
 	uri = g_strdup_printf ("file://%s", dump_file_name);
 	
-	if (nautilus_read_entire_file (uri, &dump_size, &dump_contents) == GNOME_VFS_OK) {
+	if (eel_read_entire_file (uri, &dump_size, &dump_contents) == GNOME_VFS_OK) {
 		dump_dialog_show (dump_contents, uri);
 	}
 
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index 83da7a345..57274812f 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -33,6 +33,22 @@
 
 #include "nautilus-signaller.h"
 #include <ctype.h>
+#include <eel/eel-background.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image-table.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
+#include <eel/eel-labeled-image.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
+#include <eel/eel-viewport.h>
+#include <eel/eel-xml-extensions.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <gtk/gtkcolorsel.h>
@@ -57,30 +73,14 @@
 #include <libgnomeui/gnome-stock.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-customization-data.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-drag-window.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-font-factory.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gnome-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-image.h>
-#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <eel/eel-xml-extensions.h>
-#include <eel/eel-labeled-image.h>
-#include <eel/eel-image-table.h>
-#include <eel/eel-viewport.h>
 #include <math.h>
 
 /* property types */
@@ -1055,7 +1055,7 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
 	path_uri = gnome_vfs_get_uri_from_local_path (path_name);	
 
 	/* don't allow the user to change the reset image */
-	basename = nautilus_uri_get_basename (path_uri);
+	basename = eel_uri_get_basename (path_uri);
 	if (basename && eel_strcmp (basename, RESET_IMAGE_NAME) == 0) {
 		eel_show_error_dialog (_("Sorry, but you can't replace the reset image."), _("Not an Image"), NULL);
 		g_free (path_uri);
@@ -1086,7 +1086,7 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
 		
 	g_free (directory_path);
 		
-	result = nautilus_copy_uri_simple (path_name, destination_name);		
+	result = eel_copy_uri_simple (path_name, destination_name);		
 	if (result != GNOME_VFS_OK) {
 		char *message = g_strdup_printf (_("Sorry, but the pattern %s couldn't be installed."), path_name);
 		eel_show_error_dialog (message, _("Couldn't install pattern"), GTK_WINDOW (property_browser));
@@ -1359,7 +1359,7 @@ emblem_dialog_clicked (GtkWidget *dialog, int which_button, NautilusPropertyBrow
 			g_free(directory_path);
 				
 			/* perform the actual copy */
-			result = nautilus_copy_uri_simple (property_browser->details->image_path, destination_name);		
+			result = eel_copy_uri_simple (property_browser->details->image_path, destination_name);		
 		
 			if (result != GNOME_VFS_OK) {
 				char *message = g_strdup_printf (_("Sorry, but the image at %s couldn't be installed as an emblem."), property_browser->details->image_path);
diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c
index 0b9b0fea9..ec6396754 100644
--- a/src/nautilus-sidebar.c
+++ b/src/nautilus-sidebar.c
@@ -33,6 +33,13 @@
 #include "nautilus-link-set-window.h"
 #include "nautilus-sidebar-tabs.h"
 #include "nautilus-sidebar-title.h"
+#include <eel/eel-background.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gnome-xml/parser.h>
 #include <gtk/gtkcheckmenuitem.h>
@@ -46,24 +53,17 @@
 #include <libgnomevfs/gnome-vfs-types.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-drag.h>
-#include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-file-operations.h>
-#include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <eel/eel-glib-extensions.h>
+#include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-keep-last-vertical-box.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
 #include <libnautilus-extensions/nautilus-program-choosing.h>
 #include <libnautilus-extensions/nautilus-sidebar-functions.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 #include <libnautilus-extensions/nautilus-trash-monitor.h>
 #include <math.h>
@@ -710,7 +710,7 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 							    NULL);
 			}
 		} else {	
-			if (nautilus_is_remote_uri (uris[0])) {
+			if (eel_is_remote_uri (uris[0])) {
 				eel_show_error_dialog (
 					_("The file that you dropped is not local.  "
 					  "You can only use local images as custom icons."), 
diff --git a/src/nautilus-theme-selector.c b/src/nautilus-theme-selector.c
index c623b6b57..262bff1e9 100644
--- a/src/nautilus-theme-selector.c
+++ b/src/nautilus-theme-selector.c
@@ -31,41 +31,41 @@
 #include "nautilus-theme-selector.h"
 
 #include <ctype.h>
+#include <eel/eel-background.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-font-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-label.h>
+#include <eel/eel-scalable-font.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
+#include <eel/eel-xml-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gnome-xml/parser.h>
+#include <gnome-xml/xmlmemory.h>
 #include <gtk/gtkeventbox.h>
 #include <gtk/gtkfilesel.h>
 #include <gtk/gtkframe.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkvbox.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs-types.h>
 #include <libgnomevfs/gnome-vfs-file-info.h>
+#include <libgnomevfs/gnome-vfs-types.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-font-factory.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-font-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <eel/eel-scalable-font.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <eel/eel-xml-extensions.h>
 #include <math.h>
 
 struct NautilusThemeSelectorDetails {
@@ -390,7 +390,7 @@ add_theme_to_icons (GtkWidget *widget, gpointer *data)
 	theme_selector->details->dialog = NULL;
 		
 	/* make sure it's a valid theme directory  - check for xml file */
-	theme_name = nautilus_uri_get_basename (theme_path);
+	theme_name = eel_uri_get_basename (theme_path);
 	
 	temp_path = nautilus_make_path (theme_path, theme_name);
 	xml_path = g_strconcat (temp_path, ".xml", NULL);
@@ -420,7 +420,7 @@ add_theme_to_icons (GtkWidget *widget, gpointer *data)
 			
 		/* copy the new theme into the themes directory */
 		if (result == GNOME_VFS_OK) {
-			result = nautilus_copy_uri_simple (theme_path, theme_destination_path);
+			result = eel_copy_uri_simple (theme_path, theme_destination_path);
 		}
 		
 		g_free (theme_destination_path);
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 4dce98425..f4c9a07f4 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -30,32 +30,33 @@
 
 #include "nautilus-applicable-views.h"
 #include "nautilus-application.h"
-#include "nautilus-main.h"
 #include "nautilus-location-bar.h"
+#include "nautilus-main.h"
 #include "nautilus-window-private.h"
 #include "nautilus-zoom-control.h"
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmain.h>
 #include <bonobo/bonobo-ui-util.h>
+#include <eel/eel-debug.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-dialog-util.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <eel/eel-debug.h>
-#include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-glib-extensions.h>
+#include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gtk-extensions.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-mime-actions.h>
 #include <libnautilus-extensions/nautilus-search-uri.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 
 /* FIXME bugzilla.eazel.com 1243: 
  * We should use inheritance instead of these special cases
@@ -298,7 +299,7 @@ set_displayed_location (NautilusWindow *window, const char *location)
                 recreate = TRUE;
         } else {
                 bookmark_uri = nautilus_bookmark_get_uri (window->current_location_bookmark);
-                recreate = !nautilus_uris_match (bookmark_uri, location);
+                recreate = !eel_uris_match (bookmark_uri, location);
                 g_free (bookmark_uri);
         }
         
@@ -321,7 +322,7 @@ check_bookmark_location_matches (NautilusBookmark *bookmark, const char *uri)
 	char *bookmark_uri;
 
 	bookmark_uri = nautilus_bookmark_get_uri (bookmark);
-	if (!nautilus_uris_match (uri, bookmark_uri)) {
+	if (!eel_uris_match (uri, bookmark_uri)) {
 		g_warning ("bookmark uri is %s, but expected %s", bookmark_uri, uri);
 	}
 	g_free (bookmark_uri);
@@ -423,7 +424,7 @@ handle_go_elsewhere (NautilusWindow *window, const char *location)
                  * This also avoids a problem where set_displayed_location
                  * didn't update last_location_bookmark since the uri didn't change.
                  */
-                if (!nautilus_uris_match (window->details->location, location)) {
+                if (!eel_uris_match (window->details->location, location)) {
                         /* Store bookmark for current location in back list, unless there is no current location */
 	                check_last_bookmark_location_matches_window (window);
                         
@@ -506,7 +507,7 @@ viewed_file_changed_callback (NautilusFile *file,
                  * title. Ignore fragments in this comparison, because
                  * NautilusFile omits the fragment part.
                  */
-                if (!nautilus_uris_match_ignore_fragments (new_location,
+                if (!eel_uris_match_ignore_fragments (new_location,
                                                            window->details->location)) {
                         g_free (window->details->location);
                         window->details->location = new_location;
@@ -1207,7 +1208,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
         }
         
         /* Some sort of failure occurred. How 'bout we tell the user? */
-        full_uri_for_display = nautilus_format_uri_for_display (location);
+        full_uri_for_display = eel_format_uri_for_display (location);
 	/* Truncate the URI so it doesn't get insanely wide. Note that even
 	 * though the dialog uses wrapped text, if the URI doesn't contain
 	 * white space then the text-wrapping code is too stupid to wrap it.
@@ -1334,7 +1335,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
 			   better test for that */
 			
 			home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI);
-			if (!nautilus_uris_match (home_uri, location)) {	
+			if (!eel_uris_match (home_uri, location)) {	
 				nautilus_window_go_home (NAUTILUS_WINDOW (window));
 			} else {
 				/* the last fallback is to go to a known place that can't be deleted! */
@@ -1800,7 +1801,7 @@ open_location_prefer_existing_window_callback (NautilusViewFrame *view,
                 if (existing_location == NULL) {
                         existing_location = existing_window->details->location;
                 }
-                if (nautilus_uris_match (existing_location, location)) {
+                if (eel_uris_match (existing_location, location)) {
                         eel_gtk_window_present (GTK_WINDOW (existing_window));
                         return;
                 }
@@ -1870,7 +1871,7 @@ report_redirect_callback (NautilusViewFrame *view,
                 existing_location = window->details->location;
         }
         if (existing_location == NULL
-            || !nautilus_uris_match (existing_location, from_location)) {
+            || !eel_uris_match (existing_location, from_location)) {
                 return;
         }
 
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 5fcddf519..3592a551f 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -39,6 +39,14 @@
 #include "nautilus-window-manage-views.h"
 #include "nautilus-window-private.h"
 #include <bonobo/bonobo-ui-util.h>
+#include <eel/eel-debug.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
+#include <eel/eel-xml-extensions.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <gtk/gtkmain.h>
@@ -48,17 +56,10 @@
 #include <libgnomevfs/gnome-vfs-file-info.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <eel/eel-debug.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <eel/eel-gnome-extensions.h>
-#include <eel/eel-gtk-extensions.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-undo-manager.h>
-#include <eel/eel-xml-extensions.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 
 #ifdef ENABLE_PROFILER
@@ -783,7 +784,7 @@ show_bogus_bookmark_window (BookmarkHolder *holder)
 	char *prompt;
 
 	uri = nautilus_bookmark_get_uri (holder->bookmark);
-	uri_for_display = nautilus_format_uri_for_display (uri);
+	uri_for_display = eel_format_uri_for_display (uri);
 
 	if (holder->prompt_for_removal) {
 		prompt = g_strdup_printf (_("The location \"%s\" does not exist. Do you "