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.

1 files changed, 20 insertions, 22 deletions

diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index c16926d43..eac730a09 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -1,4 +1,4 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-*/
 
 /* nautilus-metafile.c - server side of Nautilus::Metafile
  *
@@ -23,29 +23,27 @@
 #include <config.h>
 #include "nautilus-metafile.h"
 
-#include <eel/eel-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-directory.h>
-#include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus/nautilus-bonobo-workarounds.h>
-
-#include <libgnomevfs/gnome-vfs-types.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-
-#include <eel/eel-string.h>
-#include "nautilus-metadata.h"
-#include "nautilus-thumbnails.h"
-#include <eel/eel-xml-extensions.h>
-#include <eel/eel-glib-extensions.h>
+#include "nautilus-bonobo-extensions.h"
+#include "nautilus-directory.h"
 #include "nautilus-directory.h"
-#include "nautilus-global-preferences.h"
 #include "nautilus-file-private.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-metadata.h"
 #include "nautilus-search-uri.h"
-
-#include <stdlib.h>
+#include "nautilus-thumbnails.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.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>
+#include <libgnomevfs/gnome-vfs-file-info.h>
+#include <libgnomevfs/gnome-vfs-types.h>
+#include <libgnomevfs/gnome-vfs-uri.h>
+#include <libnautilus/nautilus-bonobo-workarounds.h>
+#include <stdlib.h>
 
 #define METAFILE_XML_VERSION "1.0"
 
@@ -162,7 +160,7 @@ NAUTILUS_BONOBO_X_BOILERPLATE (NautilusMetafile, Nautilus_Metafile, BONOBO_X_OBJ
 
 typedef struct MetafileReadState {
 	gboolean use_public_metafile;
-	NautilusReadFileHandle *handle;
+	EelReadFileHandle *handle;
 	GnomeVFSAsyncHandle *get_file_info_handle;
 } MetafileReadState;
 
@@ -270,7 +268,7 @@ construct_private_metafile_vfs_uri (const char *uri)
 	metafiles_directory_uri = gnome_vfs_uri_append_file_name (user_directory_uri,
 								  METAFILES_DIRECTORY_NAME);
 	gnome_vfs_uri_unref (user_directory_uri);
-	result = nautilus_make_directory_and_parents (metafiles_directory_uri,
+	result = eel_make_directory_and_parents (metafiles_directory_uri,
 						      METAFILES_DIRECTORY_PERMISSIONS);
 	if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_FILE_EXISTS) {
 		gnome_vfs_uri_unref (metafiles_directory_uri);
@@ -1658,7 +1656,7 @@ metafile_read_cancel (NautilusMetafile *metafile)
 {
 	if (metafile->details->read_state != NULL) {
 		if (metafile->details->read_state->handle != NULL) {
-			nautilus_read_file_cancel (metafile->details->read_state->handle);
+			eel_read_file_cancel (metafile->details->read_state->handle);
 		}
 		if (metafile->details->read_state->get_file_info_handle != NULL) {
 			gnome_vfs_async_cancel (metafile->details->read_state->get_file_info_handle);
@@ -1869,7 +1867,7 @@ metafile_read_restart (NautilusMetafile *metafile)
 		 : metafile->details->private_vfs_uri,
 		 GNOME_VFS_URI_HIDE_NONE);
 
-	metafile->details->read_state->handle = nautilus_read_entire_file_async
+	metafile->details->read_state->handle = eel_read_entire_file_async
 		(text_uri, metafile_read_done_callback, metafile);
 
 	g_free (text_uri);