files-view: rename from NautilusView

NautilusView is the proposed name for the new
interface that will cover NautilusFilesView and
NautilusPlacesView.

The current NautilusView name, however, will crash
with the proposed interface name.

Fix that by changing the class name to NautilusFilesView.
As an easter egg, makes it match the current Nautilus
code style.

1 files changed, 134 insertions, 134 deletions

diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index d1f3ec397..81cc2d80c 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -28,7 +28,7 @@
 #include "nautilus-canvas-view-container.h"
 #include "nautilus-desktop-canvas-view.h"
 #include "nautilus-error-reporting.h"
-#include "nautilus-view-dnd.h"
+#include "nautilus-files-view-dnd.h"
 #include "nautilus-toolbar.h"
 
 #include <stdlib.h>
@@ -158,7 +158,7 @@ static void                 nautilus_canvas_view_set_directory_sort_by        (N
 									     const char           *sort_by);
 static void                 nautilus_canvas_view_update_click_mode            (NautilusCanvasView           *canvas_view);
 static gboolean             nautilus_canvas_view_supports_scaling	      (NautilusCanvasView           *canvas_view);
-static void                 nautilus_canvas_view_reveal_selection       (NautilusView               *view);
+static void                 nautilus_canvas_view_reveal_selection       (NautilusFilesView               *view);
 static const SortCriterion *get_sort_criterion_by_sort_type           (NautilusFileSortType  sort_type);
 static gboolean             set_sort_reversed                         (NautilusCanvasView     *canvas_view,
 								       gboolean              new_value,
@@ -166,9 +166,9 @@ static gboolean             set_sort_reversed                         (NautilusC
 static void                 switch_to_manual_layout                   (NautilusCanvasView     *view);
 static NautilusFileSortType get_default_sort_order                    (NautilusFile         *file,
 								       gboolean             *reversed);
-static void                 nautilus_canvas_view_clear                  (NautilusView         *view);
+static void                 nautilus_canvas_view_clear                  (NautilusFilesView         *view);
 
-G_DEFINE_TYPE (NautilusCanvasView, nautilus_canvas_view, NAUTILUS_TYPE_VIEW);
+G_DEFINE_TYPE (NautilusCanvasView, nautilus_canvas_view, NAUTILUS_TYPE_FILES_VIEW);
 
 static void
 nautilus_canvas_view_destroy (GtkWidget *object)
@@ -177,7 +177,7 @@ nautilus_canvas_view_destroy (GtkWidget *object)
 
 	canvas_view = NAUTILUS_CANVAS_VIEW (object);
 
-	nautilus_canvas_view_clear (NAUTILUS_VIEW (object));
+	nautilus_canvas_view_clear (NAUTILUS_FILES_VIEW (object));
 
         if (canvas_view->details->react_to_canvas_change_idle_id != 0) {
                 g_source_remove (canvas_view->details->react_to_canvas_change_idle_id);
@@ -273,7 +273,7 @@ real_set_sort_criterion (NautilusCanvasView *canvas_view,
 {
 	NautilusFile *file;
 
-	file = nautilus_view_get_directory_as_file (NAUTILUS_VIEW (canvas_view));
+	file = nautilus_files_view_get_directory_as_file (NAUTILUS_FILES_VIEW (canvas_view));
 
 	if (clear) {
 		nautilus_file_set_metadata (file,
@@ -350,7 +350,7 @@ unref_cover (NautilusCanvasIconData *data, gpointer callback_data)
 }
 
 static void
-nautilus_canvas_view_clear (NautilusView *view)
+nautilus_canvas_view_clear (NautilusFilesView *view)
 {
 	NautilusCanvasContainer *canvas_container;
 	GSList *file_list;
@@ -370,26 +370,26 @@ nautilus_canvas_view_clear (NautilusView *view)
 }
 
 static void
-nautilus_canvas_view_remove_file (NautilusView *view, NautilusFile *file, NautilusDirectory *directory)
+nautilus_canvas_view_remove_file (NautilusFilesView *view, NautilusFile *file, NautilusDirectory *directory)
 {
 	NautilusCanvasView *canvas_view;
 
-	/* This used to assert that 'directory == nautilus_view_get_model (view)', but that
+	/* This used to assert that 'directory == nautilus_files_view_get_model (view)', but that
 	 * resulted in a lot of crash reports (bug #352592). I don't see how that trace happens.
 	 * It seems that somehow we get a files_changed event sent to the view from a directory
 	 * that isn't the model, but the code disables the monitor and signal callback handlers when
 	 * changing directories. Maybe we can get some more information when this happens.
 	 * Further discussion in bug #368178.
 	 */
-	if (directory != nautilus_view_get_model (view)) {
+	if (directory != nautilus_files_view_get_model (view)) {
 		char *file_uri, *dir_uri, *model_uri;
 		file_uri = nautilus_file_get_uri (file);
 		dir_uri = nautilus_directory_get_uri (directory);
-		model_uri = nautilus_directory_get_uri (nautilus_view_get_model (view));
+		model_uri = nautilus_directory_get_uri (nautilus_files_view_get_model (view));
 		g_warning ("nautilus_canvas_view_remove_file() - directory not canvas view model, shouldn't happen.\n"
 			   "file: %p:%s, dir: %p:%s, model: %p:%s, view loading: %d\n"
 			   "If you see this, please add this info to http://bugzilla.gnome.org/show_bug.cgi?id=368178",
-			   file, file_uri, directory, dir_uri, nautilus_view_get_model (view), model_uri, nautilus_view_get_loading (view));
+			   file, file_uri, directory, dir_uri, nautilus_files_view_get_model (view), model_uri, nautilus_files_view_get_loading (view));
 		g_free (file_uri);
 		g_free (dir_uri);
 		g_free (model_uri);
@@ -404,18 +404,18 @@ nautilus_canvas_view_remove_file (NautilusView *view, NautilusFile *file, Nautil
 }
 
 static void
-nautilus_canvas_view_add_file (NautilusView *view, NautilusFile *file, NautilusDirectory *directory)
+nautilus_canvas_view_add_file (NautilusFilesView *view, NautilusFile *file, NautilusDirectory *directory)
 {
 	NautilusCanvasView *canvas_view;
 	NautilusCanvasContainer *canvas_container;
 
-	g_assert (directory == nautilus_view_get_model (view));
+	g_assert (directory == nautilus_files_view_get_model (view));
 	
 	canvas_view = NAUTILUS_CANVAS_VIEW (view);
 	canvas_container = get_canvas_container (canvas_view);
 
 	/* Reset scroll region for the first canvas added when loading a directory. */
-	if (nautilus_view_get_loading (view) && nautilus_canvas_container_is_empty (canvas_container)) {
+	if (nautilus_files_view_get_loading (view) && nautilus_canvas_container_is_empty (canvas_container)) {
 		nautilus_canvas_container_reset_scroll_region (canvas_container);
 	}
 
@@ -426,11 +426,11 @@ nautilus_canvas_view_add_file (NautilusView *view, NautilusFile *file, NautilusD
 }
 
 static void
-nautilus_canvas_view_file_changed (NautilusView *view, NautilusFile *file, NautilusDirectory *directory)
+nautilus_canvas_view_file_changed (NautilusFilesView *view, NautilusFile *file, NautilusDirectory *directory)
 {
 	NautilusCanvasView *canvas_view;
 
-	g_assert (directory == nautilus_view_get_model (view));
+	g_assert (directory == nautilus_files_view_get_model (view));
 	
 	g_return_if_fail (view != NULL);
 	canvas_view = NAUTILUS_CANVAS_VIEW (view);
@@ -642,7 +642,7 @@ set_sort_reversed (NautilusCanvasView *canvas_view,
 
 	if (set_metadata) {
 		/* Store the new sort setting. */
-		nautilus_canvas_view_set_directory_sort_reversed (canvas_view, nautilus_view_get_directory_as_file (NAUTILUS_VIEW (canvas_view)), new_value);
+		nautilus_canvas_view_set_directory_sort_reversed (canvas_view, nautilus_files_view_get_directory_as_file (NAUTILUS_FILES_VIEW (canvas_view)), new_value);
 	}
 
 	return TRUE;
@@ -702,7 +702,7 @@ get_default_zoom_level (NautilusCanvasView *canvas_view)
 }
 
 static void
-nautilus_canvas_view_begin_loading (NautilusView *view)
+nautilus_canvas_view_begin_loading (NautilusFilesView *view)
 {
 	NautilusCanvasView *canvas_view;
 	GtkWidget *canvas_container;
@@ -712,7 +712,7 @@ nautilus_canvas_view_begin_loading (NautilusView *view)
 	g_return_if_fail (NAUTILUS_IS_CANVAS_VIEW (view));
 
 	canvas_view = NAUTILUS_CANVAS_VIEW (view);
-	file = nautilus_view_get_directory_as_file (view);
+	file = nautilus_files_view_get_directory_as_file (view);
 	uri = nautilus_file_get_uri (file);
 	canvas_container = GTK_WIDGET (get_canvas_container (canvas_view));
 
@@ -745,8 +745,8 @@ nautilus_canvas_view_begin_loading (NautilusView *view)
 
 	/* We could changed to the trash directory or to searching, and then we
 	 * need to update the menus */
-	nautilus_view_update_context_menus(view);
-	nautilus_view_update_toolbar_menus(view);
+	nautilus_files_view_update_context_menus(view);
+	nautilus_files_view_update_toolbar_menus(view);
 }
 
 static void
@@ -766,7 +766,7 @@ canvas_view_notify_clipboard_info (NautilusClipboardMonitor *monitor,
 }
 
 static void
-nautilus_canvas_view_end_loading (NautilusView *view,
+nautilus_canvas_view_end_loading (NautilusFilesView *view,
 			  gboolean all_files_seen)
 {
 	NautilusCanvasView *canvas_view;
@@ -786,7 +786,7 @@ nautilus_canvas_view_end_loading (NautilusView *view,
 }
 
 static NautilusCanvasZoomLevel
-nautilus_canvas_view_get_zoom_level (NautilusView *view)
+nautilus_canvas_view_get_zoom_level (NautilusFilesView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_CANVAS_VIEW (view), NAUTILUS_CANVAS_ZOOM_LEVEL_STANDARD);
 	
@@ -794,7 +794,7 @@ nautilus_canvas_view_get_zoom_level (NautilusView *view)
 }
 
 static void
-nautilus_canvas_view_zoom_to_level (NautilusView *view,
+nautilus_canvas_view_zoom_to_level (NautilusFilesView *view,
 				    gint          new_level)
 {
 	NautilusCanvasView *canvas_view;
@@ -810,19 +810,19 @@ nautilus_canvas_view_zoom_to_level (NautilusView *view,
 		return;
 
 	nautilus_canvas_container_set_zoom_level (canvas_container, new_level);
-	g_action_group_change_action_state (nautilus_view_get_action_group (view),
+	g_action_group_change_action_state (nautilus_files_view_get_action_group (view),
 					    "zoom-to-level", g_variant_new_int32 (new_level));
 
-	nautilus_view_update_toolbar_menus (view);
+	nautilus_files_view_update_toolbar_menus (view);
 }
 
 static void
-nautilus_canvas_view_bump_zoom_level (NautilusView *view, int zoom_increment)
+nautilus_canvas_view_bump_zoom_level (NautilusFilesView *view, int zoom_increment)
 {
 	NautilusCanvasZoomLevel new_level;
 
 	g_return_if_fail (NAUTILUS_IS_CANVAS_VIEW (view));
-	if (!nautilus_view_supports_zooming (view)) {
+	if (!nautilus_files_view_supports_zooming (view)) {
 		return;
 	}
 
@@ -835,7 +835,7 @@ nautilus_canvas_view_bump_zoom_level (NautilusView *view, int zoom_increment)
 }
 
 static void
-nautilus_canvas_view_restore_default_zoom_level (NautilusView *view)
+nautilus_canvas_view_restore_default_zoom_level (NautilusFilesView *view)
 {
 	NautilusCanvasView *canvas_view;
 
@@ -847,7 +847,7 @@ nautilus_canvas_view_restore_default_zoom_level (NautilusView *view)
 }
 
 static gboolean 
-nautilus_canvas_view_can_zoom_in (NautilusView *view) 
+nautilus_canvas_view_can_zoom_in (NautilusFilesView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_CANVAS_VIEW (view), FALSE);
 
@@ -856,7 +856,7 @@ nautilus_canvas_view_can_zoom_in (NautilusView *view)
 }
 
 static gboolean 
-nautilus_canvas_view_can_zoom_out (NautilusView *view) 
+nautilus_canvas_view_can_zoom_out (NautilusFilesView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_CANVAS_VIEW (view), FALSE);
 
@@ -865,7 +865,7 @@ nautilus_canvas_view_can_zoom_out (NautilusView *view)
 }
 
 static gboolean
-nautilus_canvas_view_is_empty (NautilusView *view)
+nautilus_canvas_view_is_empty (NautilusFilesView *view)
 {
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (view));
 
@@ -874,7 +874,7 @@ nautilus_canvas_view_is_empty (NautilusView *view)
 }
 
 static GList *
-nautilus_canvas_view_get_selection (NautilusView *view)
+nautilus_canvas_view_get_selection (NautilusFilesView *view)
 {
 	GList *list;
 
@@ -898,7 +898,7 @@ action_reversed_order (GSimpleAction *action,
 	reversed_order = g_variant_get_boolean (state);
 	if (set_sort_reversed (user_data, reversed_order, TRUE)) {
 		nautilus_canvas_container_sort (get_canvas_container (user_data));
-		nautilus_canvas_view_reveal_selection (NAUTILUS_VIEW (user_data));
+		nautilus_canvas_view_reveal_selection (NAUTILUS_FILES_VIEW (user_data));
 	}
 
 	g_simple_action_set_state (action, state);
@@ -914,7 +914,7 @@ action_keep_aligned (GSimpleAction *action,
 	gboolean keep_aligned;
 
 	canvas_view = NAUTILUS_CANVAS_VIEW (user_data);
-	file = nautilus_view_get_directory_as_file (NAUTILUS_VIEW (canvas_view));
+	file = nautilus_files_view_get_directory_as_file (NAUTILUS_FILES_VIEW (canvas_view));
 	keep_aligned = g_variant_get_boolean (state);
 
 	nautilus_canvas_view_set_directory_keep_aligned (canvas_view,
@@ -949,7 +949,7 @@ action_sort_order_changed (GSimpleAction *action,
 		set_sort_criterion (user_data, sort_criterion, TRUE);
 
 		nautilus_canvas_container_sort (get_canvas_container (user_data));
-		nautilus_canvas_view_reveal_selection (NAUTILUS_VIEW (user_data));
+		nautilus_canvas_view_reveal_selection (NAUTILUS_FILES_VIEW (user_data));
 	}
 
 	g_simple_action_set_state (action, value);
@@ -960,12 +960,12 @@ action_zoom_to_level (GSimpleAction *action,
 		      GVariant      *state,
 		      gpointer       user_data)
 {
-	NautilusView *view;
+	NautilusFilesView *view;
 	NautilusCanvasZoomLevel zoom_level;
 
-	g_assert (NAUTILUS_IS_VIEW (user_data));
+	g_assert (NAUTILUS_IS_FILES_VIEW (user_data));
 
-	view = NAUTILUS_VIEW (user_data);
+	view = NAUTILUS_FILES_VIEW (user_data);
 	zoom_level = g_variant_get_int32 (state);
 	nautilus_canvas_view_zoom_to_level (view, zoom_level);
 
@@ -979,7 +979,7 @@ static void
 switch_to_manual_layout (NautilusCanvasView *canvas_view)
 {
 	if (!nautilus_canvas_view_using_auto_layout (canvas_view) ||
-	    !nautilus_view_is_editable (NAUTILUS_VIEW (canvas_view))) {
+	    !nautilus_files_view_is_editable (NAUTILUS_FILES_VIEW (canvas_view))) {
 		return;
 	}
 
@@ -998,7 +998,7 @@ layout_changed_callback (NautilusCanvasContainer *container,
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (canvas_view));
 	g_assert (container == get_canvas_container (canvas_view));
 
-	file = nautilus_view_get_directory_as_file (NAUTILUS_VIEW (canvas_view));
+	file = nautilus_files_view_get_directory_as_file (NAUTILUS_FILES_VIEW (canvas_view));
 
 	if (file != NULL) {
 		nautilus_canvas_view_set_directory_auto_layout
@@ -1009,9 +1009,9 @@ layout_changed_callback (NautilusCanvasContainer *container,
 }
 
 static gboolean
-nautilus_canvas_view_can_rename_file (NautilusView *view, NautilusFile *file)
+nautilus_canvas_view_can_rename_file (NautilusFilesView *view, NautilusFile *file)
 {
-	return NAUTILUS_VIEW_CLASS(nautilus_canvas_view_parent_class)->can_rename_file (view, file);
+	return NAUTILUS_FILES_VIEW_CLASS(nautilus_canvas_view_parent_class)->can_rename_file (view, file);
 }
 
 const GActionEntry canvas_view_entries[] = {
@@ -1031,7 +1031,7 @@ update_sort_action_state_hint (NautilusCanvasView *canvas_view)
 	GVariant *state_hint;
 	gint idx;
 
-	file = nautilus_view_get_directory_as_file (NAUTILUS_VIEW (canvas_view));
+	file = nautilus_files_view_get_directory_as_file (NAUTILUS_FILES_VIEW (canvas_view));
 	g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
 
 	for (idx = 0; idx < G_N_ELEMENTS (sort_criteria); idx++) {
@@ -1042,7 +1042,7 @@ update_sort_action_state_hint (NautilusCanvasView *canvas_view)
 
 	state_hint = g_variant_builder_end (&builder);
 
-	action_group = nautilus_view_get_action_group (NAUTILUS_VIEW (canvas_view));
+	action_group = nautilus_files_view_get_action_group (NAUTILUS_FILES_VIEW (canvas_view));
 	action = g_action_map_lookup_action (G_ACTION_MAP (action_group), "sort");
 	g_simple_action_set_state_hint (G_SIMPLE_ACTION (action), state_hint);
 
@@ -1050,11 +1050,11 @@ update_sort_action_state_hint (NautilusCanvasView *canvas_view)
 }
 
 static gboolean
-showing_recent_directory (NautilusView *view)
+showing_recent_directory (NautilusFilesView *view)
 {
 	NautilusFile *file;
 
-	file = nautilus_view_get_directory_as_file (view);
+	file = nautilus_files_view_get_directory_as_file (view);
 	if (file != NULL) {
 		return nautilus_file_is_in_recent (file);
 	}
@@ -1062,11 +1062,11 @@ showing_recent_directory (NautilusView *view)
 }
 
 static gboolean
-showing_search_directory (NautilusView *view)
+showing_search_directory (NautilusFilesView *view)
 {
 	NautilusFile *file;
 
-	file = nautilus_view_get_directory_as_file (view);
+	file = nautilus_files_view_get_directory_as_file (view);
 	if (file != NULL) {
 		return nautilus_file_is_in_search (file);
 	}
@@ -1074,7 +1074,7 @@ showing_search_directory (NautilusView *view)
 }
 
 static void
-nautilus_canvas_view_update_actions_state (NautilusView *view)
+nautilus_canvas_view_update_actions_state (NautilusFilesView *view)
 {
 	GActionGroup *view_action_group;
 	GAction *action;
@@ -1083,9 +1083,9 @@ nautilus_canvas_view_update_actions_state (NautilusView *view)
 
 	canvas_view = NAUTILUS_CANVAS_VIEW (view);
 
-	NAUTILUS_VIEW_CLASS (nautilus_canvas_view_parent_class)->update_actions_state (view);
+	NAUTILUS_FILES_VIEW_CLASS (nautilus_canvas_view_parent_class)->update_actions_state (view);
 
-	view_action_group = nautilus_view_get_action_group (view);
+	view_action_group = nautilus_files_view_get_action_group (view);
 	if (nautilus_canvas_view_supports_auto_layout (canvas_view)) {
 		GVariant *sort_state;
 		GVariant *reversed_state;
@@ -1134,7 +1134,7 @@ nautilus_canvas_view_update_actions_state (NautilusView *view)
 }
 
 static void
-nautilus_canvas_view_select_all (NautilusView *view)
+nautilus_canvas_view_select_all (NautilusFilesView *view)
 {
 	NautilusCanvasContainer *canvas_container;
 
@@ -1145,7 +1145,7 @@ nautilus_canvas_view_select_all (NautilusView *view)
 }
 
 static void
-nautilus_canvas_view_select_first (NautilusView *view)
+nautilus_canvas_view_select_first (NautilusFilesView *view)
 {
 	NautilusCanvasContainer *canvas_container;
 
@@ -1156,13 +1156,13 @@ nautilus_canvas_view_select_first (NautilusView *view)
 }
 
 static void
-nautilus_canvas_view_reveal_selection (NautilusView *view)
+nautilus_canvas_view_reveal_selection (NautilusFilesView *view)
 {
 	GList *selection;
 
 	g_return_if_fail (NAUTILUS_IS_CANVAS_VIEW (view));
 
-        selection = nautilus_view_get_selection (view);
+        selection = nautilus_files_view_get_selection (view);
 
 	/* Make sure at least one of the selected items is scrolled into view */
 	if (selection != NULL) {
@@ -1175,7 +1175,7 @@ nautilus_canvas_view_reveal_selection (NautilusView *view)
 }
 
 static GdkRectangle*
-nautilus_canvas_view_compute_rename_popover_relative_to (NautilusView *view)
+nautilus_canvas_view_compute_rename_popover_relative_to (NautilusFilesView *view)
 {
         GArray *bounding_boxes;
         GdkRectangle *bounding_box;
@@ -1187,7 +1187,7 @@ nautilus_canvas_view_compute_rename_popover_relative_to (NautilusView *view)
         bounding_boxes = nautilus_canvas_container_get_selected_icons_bounding_box (canvas_container);
         /* We only allow renaming one item at once */
         bounding_box = &g_array_index (bounding_boxes, GdkRectangle, 0);
-        parent_container = nautilus_view_get_content_widget (view);
+        parent_container = nautilus_files_view_get_content_widget (view);
         vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (parent_container));
         hadjustment = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (parent_container));
 
@@ -1200,7 +1200,7 @@ nautilus_canvas_view_compute_rename_popover_relative_to (NautilusView *view)
 }
 
 static GArray *
-nautilus_canvas_view_get_selected_icon_locations (NautilusView *view)
+nautilus_canvas_view_get_selected_icon_locations (NautilusFilesView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_CANVAS_VIEW (view), NULL);
 
@@ -1210,7 +1210,7 @@ nautilus_canvas_view_get_selected_icon_locations (NautilusView *view)
 
 
 static void
-nautilus_canvas_view_set_selection (NautilusView *view, GList *selection)
+nautilus_canvas_view_set_selection (NautilusFilesView *view, GList *selection)
 {
 	g_return_if_fail (NAUTILUS_IS_CANVAS_VIEW (view));
 
@@ -1219,7 +1219,7 @@ nautilus_canvas_view_set_selection (NautilusView *view, GList *selection)
 }
 
 static void
-nautilus_canvas_view_invert_selection (NautilusView *view)
+nautilus_canvas_view_invert_selection (NautilusFilesView *view)
 {
 	g_return_if_fail (NAUTILUS_IS_CANVAS_VIEW (view));
 
@@ -1228,7 +1228,7 @@ nautilus_canvas_view_invert_selection (NautilusView *view)
 }
 
 static gboolean
-nautilus_canvas_view_using_manual_layout (NautilusView *view)
+nautilus_canvas_view_using_manual_layout (NautilusFilesView *view)
 {
 	g_return_val_if_fail (NAUTILUS_IS_CANVAS_VIEW (view), FALSE);
 
@@ -1236,7 +1236,7 @@ nautilus_canvas_view_using_manual_layout (NautilusView *view)
 }
 
 static void
-nautilus_canvas_view_widget_to_file_operation_position (NautilusView *view,
+nautilus_canvas_view_widget_to_file_operation_position (NautilusFilesView *view,
 						GdkPoint *position)
 {
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (view));
@@ -1253,7 +1253,7 @@ canvas_container_activate_callback (NautilusCanvasContainer *container,
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (canvas_view));
 	g_assert (container == get_canvas_container (canvas_view));
 
-	nautilus_view_activate_files (NAUTILUS_VIEW (canvas_view),
+	nautilus_files_view_activate_files (NAUTILUS_FILES_VIEW (canvas_view),
 				      file_list, 
 				      0, TRUE);
 }
@@ -1267,7 +1267,7 @@ canvas_container_activate_previewer_callback (NautilusCanvasContainer *container
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (canvas_view));
 	g_assert (container == get_canvas_container (canvas_view));
 
-	nautilus_view_preview_files (NAUTILUS_VIEW (canvas_view),
+	nautilus_files_view_preview_files (NAUTILUS_FILES_VIEW (canvas_view),
 				     file_list, locations);
 }
 
@@ -1332,7 +1332,7 @@ canvas_container_activate_alternate_callback (NautilusCanvasContainer *container
 	DEBUG ("Activate alternate, open in tab %d, close behind %d, new window %d\n",
 	       open_in_tab, close_behind, open_in_window);
 
-	nautilus_view_activate_files (NAUTILUS_VIEW (canvas_view), 
+	nautilus_files_view_activate_files (NAUTILUS_FILES_VIEW (canvas_view),
 				      file_list, 
 				      flags,
 				      TRUE);
@@ -1345,7 +1345,7 @@ band_select_started_callback (NautilusCanvasContainer *container,
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (canvas_view));
 	g_assert (container == get_canvas_container (canvas_view));
 
-	nautilus_view_start_batching_selection_changes (NAUTILUS_VIEW (canvas_view));
+	nautilus_files_view_start_batching_selection_changes (NAUTILUS_FILES_VIEW (canvas_view));
 }
 
 static void
@@ -1355,7 +1355,7 @@ band_select_ended_callback (NautilusCanvasContainer *container,
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (canvas_view));
 	g_assert (container == get_canvas_container (canvas_view));
 
-	nautilus_view_stop_batching_selection_changes (NAUTILUS_VIEW (canvas_view));
+	nautilus_files_view_stop_batching_selection_changes (NAUTILUS_FILES_VIEW (canvas_view));
 }
 
 int
@@ -1366,12 +1366,12 @@ nautilus_canvas_view_compare_files (NautilusCanvasView   *canvas_view,
 	return nautilus_file_compare_for_sort
 		(a, b, canvas_view->details->sort->sort_type,
 		 /* Use type-unsafe cast for performance */
-		 nautilus_view_should_sort_directories_first ((NautilusView *)canvas_view),
+		 nautilus_files_view_should_sort_directories_first ((NautilusFilesView *)canvas_view),
 		 canvas_view->details->sort_reversed);
 }
 
 static int
-compare_files (NautilusView   *canvas_view,
+compare_files (NautilusFilesView   *canvas_view,
 	       NautilusFile *a,
 	       NautilusFile *b)
 {
@@ -1385,7 +1385,7 @@ selection_changed_callback (NautilusCanvasContainer *container,
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (canvas_view));
 	g_assert (container == get_canvas_container (canvas_view));
 
-	nautilus_view_notify_selection_changed (NAUTILUS_VIEW (canvas_view));
+	nautilus_files_view_notify_selection_changed (NAUTILUS_FILES_VIEW (canvas_view));
 }
 
 static void
@@ -1396,7 +1396,7 @@ canvas_container_context_click_selection_callback (NautilusCanvasContainer *cont
 	g_assert (NAUTILUS_IS_CANVAS_CONTAINER (container));
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (canvas_view));
 
-	nautilus_view_pop_up_selection_context_menu (NAUTILUS_VIEW (canvas_view), event);
+	nautilus_files_view_pop_up_selection_context_menu (NAUTILUS_FILES_VIEW (canvas_view), event);
 }
 
 static void
@@ -1407,7 +1407,7 @@ canvas_container_context_click_background_callback (NautilusCanvasContainer *con
 	g_assert (NAUTILUS_IS_CANVAS_CONTAINER (container));
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (canvas_view));
 
-	nautilus_view_pop_up_background_context_menu (NAUTILUS_VIEW (canvas_view), event);
+	nautilus_files_view_pop_up_background_context_menu (NAUTILUS_FILES_VIEW (canvas_view), event);
 }
 
 static void
@@ -1478,7 +1478,7 @@ get_icon_drop_target_uri_callback (NautilusCanvasContainer *container,
 
 /* Preferences changed callbacks */
 static void
-nautilus_canvas_view_click_policy_changed (NautilusView *directory_view)
+nautilus_canvas_view_click_policy_changed (NautilusFilesView *directory_view)
 {
 	g_assert (NAUTILUS_IS_CANVAS_VIEW (directory_view));
 
@@ -1517,7 +1517,7 @@ default_sort_order_changed_callback (gpointer callback_data)
 
 	canvas_view = NAUTILUS_CANVAS_VIEW (callback_data);
 
-	file = nautilus_view_get_directory_as_file (NAUTILUS_VIEW (canvas_view));
+	file = nautilus_files_view_get_directory_as_file (NAUTILUS_FILES_VIEW (canvas_view));
 	sort_name = nautilus_canvas_view_get_directory_sort_by (canvas_view, file);
 	set_sort_criterion (canvas_view, get_sort_criterion_by_metadata_text (sort_name), FALSE);
 	g_free (sort_name);
@@ -1539,7 +1539,7 @@ default_sort_in_reverse_order_changed_callback (gpointer callback_data)
 
 	canvas_view = NAUTILUS_CANVAS_VIEW (callback_data);
 
-	file = nautilus_view_get_directory_as_file (NAUTILUS_VIEW (canvas_view));
+	file = nautilus_files_view_get_directory_as_file (NAUTILUS_FILES_VIEW (canvas_view));
 	set_sort_reversed (canvas_view, nautilus_canvas_view_get_directory_sort_reversed (canvas_view, file), FALSE);
 	canvas_container = get_canvas_container (canvas_view);
 	g_return_if_fail (NAUTILUS_IS_CANVAS_CONTAINER (canvas_container));
@@ -1548,7 +1548,7 @@ default_sort_in_reverse_order_changed_callback (gpointer callback_data)
 }
 
 static void
-nautilus_canvas_view_sort_directories_first_changed (NautilusView *directory_view)
+nautilus_canvas_view_sort_directories_first_changed (NautilusFilesView *directory_view)
 {
 	NautilusCanvasView *canvas_view;
 
@@ -1564,16 +1564,16 @@ static gboolean
 canvas_view_can_accept_item (NautilusCanvasContainer *container,
 			   NautilusFile *target_item,
 			   const char *item_uri,
-			   NautilusView *view)
+			   NautilusFilesView *view)
 {
 	return nautilus_drag_can_accept_item (target_item, item_uri);
 }
 
 static char *
 canvas_view_get_container_uri (NautilusCanvasContainer *container,
-			     NautilusView *view)
+			     NautilusFilesView *view)
 {
-	return nautilus_view_get_uri (view);
+	return nautilus_files_view_get_uri (view);
 }
 
 static void
@@ -1583,12 +1583,12 @@ canvas_view_move_copy_items (NautilusCanvasContainer *container,
 			   const char *target_dir,
 			   int copy_action,
 			   int x, int y,
-			   NautilusView *view)
+			   NautilusFilesView *view)
 {
 	nautilus_clipboard_clear_if_colliding_uris (GTK_WIDGET (view),
 						    item_uris,
-						    nautilus_view_get_copied_files_atom (view));
-	nautilus_view_move_copy_items (view, item_uris, relative_item_points, target_dir,
+						    nautilus_files_view_get_copied_files_atom (view));
+	nautilus_files_view_move_copy_items (view, item_uris, relative_item_points, target_dir,
 				       copy_action, x, y);
 }
 
@@ -1617,7 +1617,7 @@ get_stored_layout_timestamp (NautilusCanvasContainer *container,
 	NautilusDirectory *directory;
 
 	if (icon_data == NULL) {
-		directory = nautilus_view_get_model (NAUTILUS_VIEW (view));
+		directory = nautilus_files_view_get_model (NAUTILUS_FILES_VIEW (view));
 		if (directory == NULL) {
 			return FALSE;
 		}
@@ -1644,7 +1644,7 @@ store_layout_timestamp (NautilusCanvasContainer *container,
 	NautilusDirectory *directory;
 
 	if (icon_data == NULL) {
-		directory = nautilus_view_get_model (NAUTILUS_VIEW (view));
+		directory = nautilus_files_view_get_model (NAUTILUS_FILES_VIEW (view));
 		if (directory == NULL) {
 			return FALSE;
 		}
@@ -1669,7 +1669,7 @@ create_canvas_container (NautilusCanvasView *canvas_view)
 	NautilusCanvasContainer *canvas_container;
         GtkWidget *content_widget;
 
-        content_widget = nautilus_view_get_content_widget (NAUTILUS_VIEW (canvas_view));
+        content_widget = nautilus_files_view_get_content_widget (NAUTILUS_FILES_VIEW (canvas_view));
 	canvas_container = nautilus_canvas_view_container_new (canvas_view);
 	canvas_view->details->canvas_container = GTK_WIDGET (canvas_container);
 	g_object_add_weak_pointer (G_OBJECT (canvas_container),
@@ -1713,10 +1713,10 @@ create_canvas_container (NautilusCanvasView *canvas_view)
 	g_signal_connect_object (canvas_container, "layout-changed",
 				 G_CALLBACK (layout_changed_callback), canvas_view, 0);
 	g_signal_connect_object (canvas_container, "icon-stretch-started",
-				 G_CALLBACK (nautilus_view_update_context_menus), canvas_view,
+				 G_CALLBACK (nautilus_files_view_update_context_menus), canvas_view,
 				 G_CONNECT_SWAPPED);
 	g_signal_connect_object (canvas_container, "icon-stretch-ended",
-				 G_CALLBACK (nautilus_view_update_context_menus), canvas_view,
+				 G_CALLBACK (nautilus_files_view_update_context_menus), canvas_view,
 				 G_CONNECT_SWAPPED);
 
 	g_signal_connect_object (canvas_container, "get-stored-layout-timestamp",
@@ -1742,7 +1742,7 @@ canvas_view_handle_netscape_url (NautilusCanvasContainer *container, const char
 			       const char *target_uri,
 			       GdkDragAction action, int x, int y, NautilusCanvasView *view)
 {
-	nautilus_view_handle_netscape_url_drop (NAUTILUS_VIEW (view),
+	nautilus_files_view_handle_netscape_url_drop (NAUTILUS_FILES_VIEW (view),
 						encoded_url, target_uri, action, x, y);
 }
 
@@ -1751,7 +1751,7 @@ canvas_view_handle_uri_list (NautilusCanvasContainer *container, const char *ite
 			   const char *target_uri,
 			   GdkDragAction action, int x, int y, NautilusCanvasView *view)
 {
-	nautilus_view_handle_uri_list_drop (NAUTILUS_VIEW (view),
+	nautilus_files_view_handle_uri_list_drop (NAUTILUS_FILES_VIEW (view),
 					    item_uris, target_uri, action, x, y);
 }
 
@@ -1760,7 +1760,7 @@ canvas_view_handle_text (NautilusCanvasContainer *container, const char *text,
 		       const char *target_uri,
 		       GdkDragAction action, int x, int y, NautilusCanvasView *view)
 {
-	nautilus_view_handle_text_drop (NAUTILUS_VIEW (view),
+	nautilus_files_view_handle_text_drop (NAUTILUS_FILES_VIEW (view),
 					text, target_uri, action, x, y);
 }
 
@@ -1769,7 +1769,7 @@ canvas_view_handle_raw (NautilusCanvasContainer *container, const char *raw_data
 		      int length, const char *target_uri, const char *direct_save_uri,
 		      GdkDragAction action, int x, int y, NautilusCanvasView *view)
 {
-	nautilus_view_handle_raw_drop (NAUTILUS_VIEW (view),
+	nautilus_files_view_handle_raw_drop (NAUTILUS_FILES_VIEW (view),
 				       raw_data, length, target_uri, direct_save_uri, action, x, y);
 }
 
@@ -1778,11 +1778,11 @@ canvas_view_handle_hover (NautilusCanvasContainer *container,
 			  const char *target_uri,
 			  NautilusCanvasView *view)
 {
-	nautilus_view_handle_hover (NAUTILUS_VIEW (view), target_uri);
+	nautilus_files_view_handle_hover (NAUTILUS_FILES_VIEW (view), target_uri);
 }
 
 static char *
-canvas_view_get_first_visible_file (NautilusView *view)
+canvas_view_get_first_visible_file (NautilusFilesView *view)
 {
 	NautilusFile *file;
 	NautilusCanvasView *canvas_view;
@@ -1799,7 +1799,7 @@ canvas_view_get_first_visible_file (NautilusView *view)
 }
 
 static void
-canvas_view_scroll_to_file (NautilusView *view,
+canvas_view_scroll_to_file (NautilusFilesView *view,
 			  const char *uri)
 {
 	NautilusFile *file;
@@ -1820,7 +1820,7 @@ canvas_view_scroll_to_file (NautilusView *view,
 }
 
 static const char *
-nautilus_canvas_view_get_id (NautilusView *view)
+nautilus_canvas_view_get_id (NautilusFilesView *view)
 {
 	return NAUTILUS_CANVAS_VIEW_ID;
 }
@@ -1883,7 +1883,7 @@ nautilus_canvas_view_finalize (GObject *object)
 }
 
 static GIcon*
-nautilus_canvas_view_get_icon (NautilusView *view)
+nautilus_canvas_view_get_icon (NautilusFilesView *view)
 {
         g_return_val_if_fail (NAUTILUS_IS_CANVAS_VIEW (view), NULL);
 
@@ -1893,10 +1893,10 @@ nautilus_canvas_view_get_icon (NautilusView *view)
 static void
 nautilus_canvas_view_class_init (NautilusCanvasViewClass *klass)
 {
-	NautilusViewClass *nautilus_view_class;
+	NautilusFilesViewClass *nautilus_files_view_class;
 	GObjectClass *oclass;
 
-	nautilus_view_class = NAUTILUS_VIEW_CLASS (klass);
+	nautilus_files_view_class = NAUTILUS_FILES_VIEW_CLASS (klass);
 	oclass = G_OBJECT_CLASS (klass);
 
 	oclass->set_property = nautilus_canvas_view_set_property;
@@ -1904,37 +1904,37 @@ nautilus_canvas_view_class_init (NautilusCanvasViewClass *klass)
 
 	GTK_WIDGET_CLASS (klass)->destroy = nautilus_canvas_view_destroy;
 	
-	nautilus_view_class->add_file = nautilus_canvas_view_add_file;
-	nautilus_view_class->begin_loading = nautilus_canvas_view_begin_loading;
-	nautilus_view_class->bump_zoom_level = nautilus_canvas_view_bump_zoom_level;
-	nautilus_view_class->can_rename_file = nautilus_canvas_view_can_rename_file;
-	nautilus_view_class->can_zoom_in = nautilus_canvas_view_can_zoom_in;
-	nautilus_view_class->can_zoom_out = nautilus_canvas_view_can_zoom_out;
-	nautilus_view_class->clear = nautilus_canvas_view_clear;
-	nautilus_view_class->end_loading = nautilus_canvas_view_end_loading;
-	nautilus_view_class->file_changed = nautilus_canvas_view_file_changed;
-	nautilus_view_class->get_selected_icon_locations = nautilus_canvas_view_get_selected_icon_locations;
-	nautilus_view_class->compute_rename_popover_relative_to = nautilus_canvas_view_compute_rename_popover_relative_to;
-	nautilus_view_class->get_selection = nautilus_canvas_view_get_selection;
-	nautilus_view_class->get_selection_for_file_transfer = nautilus_canvas_view_get_selection;
-	nautilus_view_class->is_empty = nautilus_canvas_view_is_empty;
-	nautilus_view_class->remove_file = nautilus_canvas_view_remove_file;
-	nautilus_view_class->restore_default_zoom_level = nautilus_canvas_view_restore_default_zoom_level;
-	nautilus_view_class->reveal_selection = nautilus_canvas_view_reveal_selection;
-	nautilus_view_class->select_all = nautilus_canvas_view_select_all;
-	nautilus_view_class->select_first = nautilus_canvas_view_select_first;
-	nautilus_view_class->set_selection = nautilus_canvas_view_set_selection;
-	nautilus_view_class->invert_selection = nautilus_canvas_view_invert_selection;
-	nautilus_view_class->compare_files = compare_files;
-        nautilus_view_class->click_policy_changed = nautilus_canvas_view_click_policy_changed;
-	nautilus_view_class->update_actions_state = nautilus_canvas_view_update_actions_state;
-        nautilus_view_class->sort_directories_first_changed = nautilus_canvas_view_sort_directories_first_changed;
-	nautilus_view_class->using_manual_layout = nautilus_canvas_view_using_manual_layout;
-	nautilus_view_class->widget_to_file_operation_position = nautilus_canvas_view_widget_to_file_operation_position;
-	nautilus_view_class->get_view_id = nautilus_canvas_view_get_id;
-	nautilus_view_class->get_first_visible_file = canvas_view_get_first_visible_file;
-	nautilus_view_class->scroll_to_file = canvas_view_scroll_to_file;
-        nautilus_view_class->get_icon = nautilus_canvas_view_get_icon;
+	nautilus_files_view_class->add_file = nautilus_canvas_view_add_file;
+	nautilus_files_view_class->begin_loading = nautilus_canvas_view_begin_loading;
+	nautilus_files_view_class->bump_zoom_level = nautilus_canvas_view_bump_zoom_level;
+	nautilus_files_view_class->can_rename_file = nautilus_canvas_view_can_rename_file;
+	nautilus_files_view_class->can_zoom_in = nautilus_canvas_view_can_zoom_in;
+	nautilus_files_view_class->can_zoom_out = nautilus_canvas_view_can_zoom_out;
+	nautilus_files_view_class->clear = nautilus_canvas_view_clear;
+	nautilus_files_view_class->end_loading = nautilus_canvas_view_end_loading;
+	nautilus_files_view_class->file_changed = nautilus_canvas_view_file_changed;
+	nautilus_files_view_class->get_selected_icon_locations = nautilus_canvas_view_get_selected_icon_locations;
+	nautilus_files_view_class->compute_rename_popover_relative_to = nautilus_canvas_view_compute_rename_popover_relative_to;
+	nautilus_files_view_class->get_selection = nautilus_canvas_view_get_selection;
+	nautilus_files_view_class->get_selection_for_file_transfer = nautilus_canvas_view_get_selection;
+	nautilus_files_view_class->is_empty = nautilus_canvas_view_is_empty;
+	nautilus_files_view_class->remove_file = nautilus_canvas_view_remove_file;
+	nautilus_files_view_class->restore_default_zoom_level = nautilus_canvas_view_restore_default_zoom_level;
+	nautilus_files_view_class->reveal_selection = nautilus_canvas_view_reveal_selection;
+	nautilus_files_view_class->select_all = nautilus_canvas_view_select_all;
+	nautilus_files_view_class->select_first = nautilus_canvas_view_select_first;
+	nautilus_files_view_class->set_selection = nautilus_canvas_view_set_selection;
+	nautilus_files_view_class->invert_selection = nautilus_canvas_view_invert_selection;
+	nautilus_files_view_class->compare_files = compare_files;
+        nautilus_files_view_class->click_policy_changed = nautilus_canvas_view_click_policy_changed;
+	nautilus_files_view_class->update_actions_state = nautilus_canvas_view_update_actions_state;
+        nautilus_files_view_class->sort_directories_first_changed = nautilus_canvas_view_sort_directories_first_changed;
+	nautilus_files_view_class->using_manual_layout = nautilus_canvas_view_using_manual_layout;
+	nautilus_files_view_class->widget_to_file_operation_position = nautilus_canvas_view_widget_to_file_operation_position;
+	nautilus_files_view_class->get_view_id = nautilus_canvas_view_get_id;
+	nautilus_files_view_class->get_first_visible_file = canvas_view_get_first_visible_file;
+	nautilus_files_view_class->scroll_to_file = canvas_view_scroll_to_file;
+        nautilus_files_view_class->get_icon = nautilus_canvas_view_get_icon;
 
 	properties[PROP_SUPPORTS_AUTO_LAYOUT] =
 		g_param_spec_boolean ("supports-auto-layout",
@@ -2014,17 +2014,17 @@ nautilus_canvas_view_init (NautilusCanvasView *canvas_view)
 		                  "clipboard-info",
 		                  G_CALLBACK (canvas_view_notify_clipboard_info), canvas_view);
 
-	view_action_group = nautilus_view_get_action_group (NAUTILUS_VIEW (canvas_view));
+	view_action_group = nautilus_files_view_get_action_group (NAUTILUS_FILES_VIEW (canvas_view));
 	g_action_map_add_action_entries (G_ACTION_MAP (view_action_group),
 					 canvas_view_entries,
 					 G_N_ELEMENTS (canvas_view_entries),
 					 canvas_view);
 	/* Keep the action synced with the actual value, so the toolbar can poll it */
-	g_action_group_change_action_state (nautilus_view_get_action_group (NAUTILUS_VIEW (canvas_view)),
+	g_action_group_change_action_state (nautilus_files_view_get_action_group (NAUTILUS_FILES_VIEW (canvas_view)),
 					    "zoom-to-level", g_variant_new_int32 (get_default_zoom_level (canvas_view)));
 }
 
-NautilusView *
+NautilusFilesView *
 nautilus_canvas_view_new (NautilusWindowSlot *slot)
 {
 	return g_object_new (NAUTILUS_TYPE_CANVAS_VIEW,