general: Rename NautilusCanvasIconData to NautilusFile

NautilusCanvasIconData is a typedef for NautilusFile, and that really
hurts code readability.

6 files changed, 131 insertions, 162 deletions

diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index 54349c886..40566c981 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -373,12 +373,12 @@ icon_toggle_selected (NautilusCanvasContainer *container,
     icon->is_selected = !icon->is_selected;
     if (icon->is_selected)
     {
-        container->details->selection = g_list_prepend (container->details->selection, icon->data);
+        container->details->selection = g_list_prepend (container->details->selection, icon->file);
         container->details->selection_needs_resort = TRUE;
     }
     else
     {
-        container->details->selection = g_list_remove (container->details->selection, icon->data);
+        container->details->selection = g_list_remove (container->details->selection, icon->file);
     }
 
     eel_canvas_item_set (EEL_CANVAS_ITEM (icon->item),
@@ -1030,13 +1030,14 @@ compare_icons_data (gconstpointer a,
                     gpointer      canvas_container)
 {
     NautilusCanvasContainerClass *klass;
-    NautilusCanvasIconData *data_a, *data_b;
+    NautilusFile *file_a;
+    NautilusFile *file_b;
 
-    data_a = (NautilusCanvasIconData *) a;
-    data_b = (NautilusCanvasIconData *) b;
+    file_a = NAUTILUS_FILE (a);
+    file_b = NAUTILUS_FILE (b);
     klass = NAUTILUS_CANVAS_CONTAINER_GET_CLASS (canvas_container);
 
-    return klass->compare_icons (canvas_container, data_a, data_b);
+    return klass->compare_icons (canvas_container, file_a, file_b);
 }
 
 static int
@@ -1051,7 +1052,7 @@ compare_icons (gconstpointer a,
     icon_b = b;
     klass = NAUTILUS_CANVAS_CONTAINER_GET_CLASS (canvas_container);
 
-    return klass->compare_icons (canvas_container, icon_a->data, icon_b->data);
+    return klass->compare_icons (canvas_container, icon_a->file, icon_b->file);
 }
 
 static void
@@ -3222,7 +3223,7 @@ on_event_controller_motion_motion (GtkEventControllerMotion *controller,
 
 static void
 nautilus_canvas_container_get_icon_text (NautilusCanvasContainer  *container,
-                                         NautilusCanvasIconData   *data,
+                                         NautilusFile             *file,
                                          char                    **editable_text,
                                          char                    **additional_text,
                                          gboolean                  include_invisible)
@@ -3232,7 +3233,7 @@ nautilus_canvas_container_get_icon_text (NautilusCanvasContainer  *container,
     klass = NAUTILUS_CANVAS_CONTAINER_GET_CLASS (container);
     g_assert (klass->get_icon_text != NULL);
 
-    klass->get_icon_text (container, data, editable_text, additional_text, include_invisible);
+    klass->get_icon_text (container, file, editable_text, additional_text, include_invisible);
 }
 
 static gboolean
@@ -4372,7 +4373,7 @@ nautilus_canvas_container_is_empty (NautilusCanvasContainer *container)
     return container->details->icons == NULL;
 }
 
-NautilusCanvasIconData *
+NautilusFile *
 nautilus_canvas_container_get_first_visible_icon (NautilusCanvasContainer *container)
 {
     GList *l;
@@ -4444,10 +4445,10 @@ nautilus_canvas_container_get_first_visible_icon (NautilusCanvasContainer *conta
         l = l->next;
     }
 
-    return best_icon ? best_icon->data : NULL;
+    return best_icon ? best_icon->file : NULL;
 }
 
-NautilusCanvasIconData *
+NautilusFile *
 nautilus_canvas_container_get_focused_icon (NautilusCanvasContainer *container)
 {
     NautilusCanvasIcon *icon;
@@ -4456,7 +4457,7 @@ nautilus_canvas_container_get_focused_icon (NautilusCanvasContainer *container)
 
     if (icon != NULL)
     {
-        return icon->data;
+        return icon->file;
     }
 
     return NULL;
@@ -4465,7 +4466,7 @@ nautilus_canvas_container_get_focused_icon (NautilusCanvasContainer *container)
 /* puts the icon at the top of the screen */
 void
 nautilus_canvas_container_scroll_to_canvas (NautilusCanvasContainer *container,
-                                            NautilusCanvasIconData  *data)
+                                            NautilusFile            *file)
 {
     GList *l;
     NautilusCanvasIcon *icon;
@@ -4485,8 +4486,7 @@ nautilus_canvas_container_scroll_to_canvas (NautilusCanvasContainer *container,
     {
         icon = l->data;
 
-        if (icon->data == data &&
-            icon_is_positioned (icon))
+        if (icon->file == file && icon_is_positioned (icon))
         {
             /* ensure that we reveal the entire row/column */
             icon_get_row_and_column_bounds (container, icon, &bounds);
@@ -4514,7 +4514,7 @@ call_canvas_callback (gpointer data,
 
     icon = data;
     callback_and_data = callback_data;
-    (*callback_and_data->callback)(icon->data, callback_and_data->callback_data);
+    (*callback_and_data->callback)(icon->file, callback_and_data->callback_data);
 }
 
 void
@@ -4566,8 +4566,8 @@ icon_destroy (NautilusCanvasContainer *container,
 
     details->icons = g_list_remove (details->icons, icon);
     details->new_icons = g_list_remove (details->new_icons, icon);
-    details->selection = g_list_remove (details->selection, icon->data);
-    g_hash_table_remove (details->icon_set, icon->data);
+    details->selection = g_list_remove (details->selection, icon->file);
+    g_hash_table_remove (details->icon_set, icon->file);
 
     was_selected = icon->is_selected;
 
@@ -4683,7 +4683,7 @@ activate_selected_items_alternate (NautilusCanvasContainer *container,
 
     if (icon != NULL)
     {
-        selection = g_list_prepend (NULL, icon->data);
+        selection = g_list_prepend (NULL, icon->file);
     }
     else
     {
@@ -4702,7 +4702,7 @@ activate_selected_items_alternate (NautilusCanvasContainer *container,
 
 static NautilusIconInfo *
 nautilus_canvas_container_get_icon_images (NautilusCanvasContainer *container,
-                                           NautilusCanvasIconData  *data,
+                                           NautilusFile            *file,
                                            int                      size,
                                            gboolean                 for_drag_accept)
 {
@@ -4711,7 +4711,7 @@ nautilus_canvas_container_get_icon_images (NautilusCanvasContainer *container,
     klass = NAUTILUS_CANVAS_CONTAINER_GET_CLASS (container);
     g_assert (klass->get_icon_images != NULL);
 
-    return klass->get_icon_images (container, data, size, for_drag_accept);
+    return klass->get_icon_images (container, file, size, for_drag_accept);
 }
 
 static void
@@ -4723,7 +4723,7 @@ nautilus_canvas_container_prioritize_thumbnailing (NautilusCanvasContainer *cont
     klass = NAUTILUS_CANVAS_CONTAINER_GET_CLASS (container);
     g_assert (klass->prioritize_thumbnailing != NULL);
 
-    klass->prioritize_thumbnailing (container, icon->data);
+    klass->prioritize_thumbnailing (container, icon->file);
 }
 
 static void
@@ -4830,14 +4830,14 @@ nautilus_canvas_container_update_icon (NautilusCanvasContainer *container,
     DEBUG ("Icon size, getting for size %d", icon_size);
 
     /* Get the icons. */
-    icon_info = nautilus_canvas_container_get_icon_images (container, icon->data, icon_size,
+    icon_info = nautilus_canvas_container_get_icon_images (container, icon->file, icon_size,
                                                            icon == details->drop_target);
 
     pixbuf = nautilus_icon_info_get_pixbuf (icon_info);
     g_object_unref (icon_info);
 
     nautilus_canvas_container_get_icon_text (container,
-                                             icon->data,
+                                             icon->file,
                                              &editable_text,
                                              &additional_text,
                                              FALSE);
@@ -4867,7 +4867,7 @@ finish_adding_icon (NautilusCanvasContainer *container,
     g_signal_connect_object (icon->item, "event",
                              G_CALLBACK (item_event_callback), container, 0);
 
-    g_signal_emit (container, signals[ICON_ADDED], 0, icon->data);
+    g_signal_emit (container, signals[ICON_ADDED], 0, icon->file);
 }
 
 static gboolean
@@ -4901,25 +4901,25 @@ finish_adding_new_icons (NautilusCanvasContainer *container)
  **/
 gboolean
 nautilus_canvas_container_add (NautilusCanvasContainer *container,
-                               NautilusCanvasIconData  *data)
+                               NautilusFile            *file)
 {
     NautilusCanvasContainerDetails *details;
     NautilusCanvasIcon *icon;
     EelCanvasItem *band, *item;
 
     g_return_val_if_fail (NAUTILUS_IS_CANVAS_CONTAINER (container), FALSE);
-    g_return_val_if_fail (data != NULL, FALSE);
+    g_return_val_if_fail (file != NULL, FALSE);
 
     details = container->details;
 
-    if (g_hash_table_lookup (details->icon_set, data) != NULL)
+    if (g_hash_table_lookup (details->icon_set, file) != NULL)
     {
         return FALSE;
     }
 
     /* Create the new icon, including the canvas item. */
     icon = g_new0 (NautilusCanvasIcon, 1);
-    icon->data = data;
+    icon->file = file;
     icon->x = ICON_UNPOSITIONED_VALUE;
     icon->y = ICON_UNPOSITIONED_VALUE;
 
@@ -4946,7 +4946,7 @@ nautilus_canvas_container_add (NautilusCanvasContainer *container,
     details->icons = g_list_prepend (details->icons, icon);
     details->new_icons = g_list_prepend (details->new_icons, icon);
 
-    g_hash_table_insert (details->icon_set, data, icon);
+    g_hash_table_insert (details->icon_set, file, icon);
 
     details->needs_resort = TRUE;
 
@@ -4976,20 +4976,20 @@ nautilus_canvas_container_layout_now (NautilusCanvasContainer *container)
 /**
  * nautilus_canvas_container_remove:
  * @container: A NautilusCanvasContainer.
- * @data: Icon data.
+ * @data: Icon file.
  *
- * Remove the icon with this data.
+ * Remove the icon with this file.
  **/
 gboolean
 nautilus_canvas_container_remove (NautilusCanvasContainer *container,
-                                  NautilusCanvasIconData  *data)
+                                  NautilusFile            *file)
 {
     NautilusCanvasIcon *icon;
 
     g_return_val_if_fail (NAUTILUS_IS_CANVAS_CONTAINER (container), FALSE);
-    g_return_val_if_fail (data != NULL, FALSE);
+    g_return_val_if_fail (file != NULL, FALSE);
 
-    icon = g_hash_table_lookup (container->details->icon_set, data);
+    icon = g_hash_table_lookup (container->details->icon_set, file);
 
     if (icon == NULL)
     {
@@ -5007,20 +5007,20 @@ nautilus_canvas_container_remove (NautilusCanvasContainer *container,
 /**
  * nautilus_canvas_container_request_update:
  * @container: A NautilusCanvasContainer.
- * @data: Icon data.
+ * @data: Icon file.
  *
- * Update the icon with this data.
+ * Update the icon with this file.
  **/
 void
 nautilus_canvas_container_request_update (NautilusCanvasContainer *container,
-                                          NautilusCanvasIconData  *data)
+                                          NautilusFile            *file)
 {
     NautilusCanvasIcon *icon;
 
     g_return_if_fail (NAUTILUS_IS_CANVAS_CONTAINER (container));
-    g_return_if_fail (data != NULL);
+    g_return_if_fail (file != NULL);
 
-    icon = g_hash_table_lookup (container->details->icon_set, data);
+    icon = g_hash_table_lookup (container->details->icon_set, file);
 
     if (icon != NULL)
     {
@@ -5091,14 +5091,14 @@ nautilus_canvas_container_request_update_all (NautilusCanvasContainer *container
  */
 void
 nautilus_canvas_container_reveal (NautilusCanvasContainer *container,
-                                  NautilusCanvasIconData  *data)
+                                  NautilusFile            *file)
 {
     NautilusCanvasIcon *icon;
 
     g_return_if_fail (NAUTILUS_IS_CANVAS_CONTAINER (container));
-    g_return_if_fail (data != NULL);
+    g_return_if_fail (file != NULL);
 
-    icon = g_hash_table_lookup (container->details->icon_set, data);
+    icon = g_hash_table_lookup (container->details->icon_set, file);
 
     if (icon != NULL)
     {
@@ -5204,16 +5204,16 @@ nautilus_canvas_container_get_icon_locations (NautilusCanvasContainer *container
  * pixels_per_unit already, so they are the final positions on the canvas */
 GdkRectangle *
 nautilus_canvas_container_get_icon_bounding_box (NautilusCanvasContainer *container,
-                                                 NautilusCanvasIconData  *data)
+                                                 NautilusFile            *file)
 {
     NautilusCanvasIcon *icon;
     int x1, x2, y1, y2;
     GdkRectangle *bounding_box;
 
     g_return_val_if_fail (NAUTILUS_IS_CANVAS_CONTAINER (container), NULL);
-    g_return_val_if_fail (data != NULL, NULL);
+    g_return_val_if_fail (file != NULL, NULL);
 
-    icon = g_hash_table_lookup (container->details->icon_set, data);
+    icon = g_hash_table_lookup (container->details->icon_set, file);
     icon_get_bounding_box (icon,
                            &x1, &y1, &x2, &y2,
                            BOUNDS_USAGE_FOR_DISPLAY);
@@ -5316,7 +5316,7 @@ nautilus_canvas_container_select_first (NautilusCanvasContainer *container)
 /**
  * nautilus_canvas_container_set_selection:
  * @container: An canvas container widget.
- * @selection: A list of NautilusCanvasIconData *.
+ * @selection: A list of NautilusFile *.
  *
  * Set the selection to exactly the icons in @container which have
  * programmer data matching one of the items in @selection.
@@ -5347,7 +5347,7 @@ nautilus_canvas_container_set_selection (NautilusCanvasContainer *container,
 
         res = icon_set_selected
                   (container, icon,
-                  g_hash_table_lookup (hash, icon->data) != NULL);
+                  g_hash_table_lookup (hash, icon->file) != NULL);
         selection_changed |= res;
 
         if (res)
@@ -5544,7 +5544,7 @@ nautilus_canvas_container_get_icon_uri (NautilusCanvasContainer *container,
     uri = NULL;
     g_signal_emit (container,
                    signals[GET_ICON_URI], 0,
-                   icon->data,
+                   icon->file,
                    &uri);
     return uri;
 }
@@ -5558,7 +5558,7 @@ nautilus_canvas_container_get_icon_activation_uri (NautilusCanvasContainer *cont
     uri = NULL;
     g_signal_emit (container,
                    signals[GET_ICON_ACTIVATION_URI], 0,
-                   icon->data,
+                   icon->file,
                    &uri);
     return uri;
 }
@@ -5572,7 +5572,7 @@ nautilus_canvas_container_get_icon_drop_target_uri (NautilusCanvasContainer *con
     uri = NULL;
     g_signal_emit (container,
                    signals[GET_ICON_DROP_TARGET_URI], 0,
-                   icon->data,
+                   icon->file,
                    &uri);
     return uri;
 }
@@ -5623,7 +5623,7 @@ nautilus_canvas_container_set_font (NautilusCanvasContainer *container,
  **/
 char *
 nautilus_canvas_container_get_icon_description (NautilusCanvasContainer *container,
-                                                NautilusCanvasIconData  *data)
+                                                NautilusFile            *file)
 {
     NautilusCanvasContainerClass *klass;
 
@@ -5631,7 +5631,7 @@ nautilus_canvas_container_get_icon_description (NautilusCanvasContainer *contain
 
     if (klass->get_icon_description)
     {
-        return klass->get_icon_description (container, data);
+        return klass->get_icon_description (container, file);
     }
     else
     {
@@ -5658,7 +5658,7 @@ nautilus_canvas_container_set_highlighted_for_clipboard (NautilusCanvasContainer
     for (l = container->details->icons; l != NULL; l = l->next)
     {
         icon = l->data;
-        highlighted_for_clipboard = (g_list_find (clipboard_canvas_data, icon->data) != NULL);
+        highlighted_for_clipboard = (g_list_find (clipboard_canvas_data, icon->file) != NULL);
 
         eel_canvas_item_set (EEL_CANVAS_ITEM (icon->item),
                              "highlighted-for-clipboard", highlighted_for_clipboard,
@@ -5829,7 +5829,7 @@ nautilus_canvas_container_accessible_selection_changed_cb (NautilusCanvasContain
 
 static void
 nautilus_canvas_container_accessible_icon_added_cb (NautilusCanvasContainer *container,
-                                                    NautilusCanvasIconData  *icon_data,
+                                                    NautilusFile            *file,
                                                     gpointer                 data)
 {
     NautilusCanvasIcon *icon;
@@ -5840,12 +5840,11 @@ nautilus_canvas_container_accessible_icon_added_cb (NautilusCanvasContainer *con
     if (!container->details->in_layout_now || container->details->is_populating_container)
         return;
 
-    icon = g_hash_table_lookup (container->details->icon_set, icon_data);
+    icon = g_hash_table_lookup (container->details->icon_set, file);
     if (icon)
     {
         atk_parent = ATK_OBJECT (data);
-        atk_child = atk_gobject_accessible_for_object
-                        (G_OBJECT (icon->item));
+        atk_child = atk_gobject_accessible_for_object (G_OBJECT (icon->item));
 
         g_signal_emit_by_name (atk_parent, "children-changed::add",
                                icon->position, atk_child, NULL);
@@ -5854,19 +5853,18 @@ nautilus_canvas_container_accessible_icon_added_cb (NautilusCanvasContainer *con
 
 static void
 nautilus_canvas_container_accessible_icon_removed_cb (NautilusCanvasContainer *container,
-                                                      NautilusCanvasIconData  *icon_data,
+                                                      NautilusFile            *file,
                                                       gpointer                 data)
 {
     NautilusCanvasIcon *icon;
     AtkObject *atk_parent;
     AtkObject *atk_child;
 
-    icon = g_hash_table_lookup (container->details->icon_set, icon_data);
+    icon = g_hash_table_lookup (container->details->icon_set, file);
     if (icon)
     {
-        atk_parent = ATK_OBJECT (data);
-        atk_child = atk_gobject_accessible_for_object
-                        (G_OBJECT (icon->item));
+        atk_parent = ATK_OBJECT (file);
+        atk_child = atk_gobject_accessible_for_object (G_OBJECT (icon->item));
 
         g_signal_emit_by_name (atk_parent, "children-changed::remove",
                                icon->position, atk_child, NULL);
@@ -5905,7 +5903,7 @@ nautilus_canvas_container_accessible_add_selection (AtkSelection *accessible,
 
         selection = nautilus_canvas_container_get_selection (container);
         selection = g_list_prepend (selection,
-                                    icon->data);
+                                    icon->file);
         nautilus_canvas_container_set_selection (container, selection);
 
         g_list_free (selection);
@@ -6031,7 +6029,7 @@ nautilus_canvas_container_accessible_remove_selection (AtkSelection *accessible,
         icon = l->data;
 
         selection = nautilus_canvas_container_get_selection (container);
-        selection = g_list_remove (selection, icon->data);
+        selection = g_list_remove (selection, icon->file);
         nautilus_canvas_container_set_selection (container, selection);
 
         g_list_free (selection);
diff --git a/src/nautilus-canvas-container.h b/src/nautilus-canvas-container.h
index 6393c59e4..f8fd7f50c 100644
--- a/src/nautilus-canvas-container.h
+++ b/src/nautilus-canvas-container.h
@@ -40,12 +40,7 @@
   (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_CANVAS_CONTAINER, NautilusCanvasContainerClass))
 
 
-#define NAUTILUS_CANVAS_ICON_DATA(pointer) \
-	((NautilusCanvasIconData *) (pointer))
-
-typedef struct NautilusCanvasIconData NautilusCanvasIconData;
-
-typedef void (* NautilusCanvasCallback) (NautilusCanvasIconData *icon_data,
+typedef void (* NautilusCanvasCallback) (NautilusFile *file,
 					 gpointer callback_data);
 
 typedef struct {
@@ -79,9 +74,9 @@ typedef struct {
 
 	/* Operations on icons. */
 	void         (* activate)	  	  (NautilusCanvasContainer *container,
-						   NautilusCanvasIconData *data);
+						   NautilusFile            *file);
 	void         (* activate_alternate)       (NautilusCanvasContainer *container,
-						   NautilusCanvasIconData *data);
+						   NautilusFile            *file);
 	void         (* activate_previewer)       (NautilusCanvasContainer *container,
 						   GList *files,
 						   GArray *locations);
@@ -126,38 +121,38 @@ typedef struct {
 	 * good enough, these are _not_ signals.
 	 */
 	NautilusIconInfo *(* get_icon_images)     (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *data,
+						     NautilusFile           *file,
 						     int canvas_size,
 						     gboolean for_drag_accept);
 	void         (* get_icon_text)            (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *data,
+						     NautilusFile           *file,
 						     char **editable_text,
 						     char **additional_text,
 						     gboolean include_invisible);
 	char *       (* get_icon_description)     (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *data);
+						     NautilusFile           *file);
 	int          (* compare_icons)            (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *canvas_a,
-						     NautilusCanvasIconData *canvas_b);
+						     NautilusFile           *canvas_a,
+						     NautilusFile           *canvas_b);
 	int          (* compare_icons_by_name)    (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *canvas_a,
-						     NautilusCanvasIconData *canvas_b);
+						     NautilusFile           *canvas_a,
+						     NautilusFile           *canvas_b);
 	void         (* prioritize_thumbnailing)  (NautilusCanvasContainer *container,
-						   NautilusCanvasIconData *data);
+						   NautilusFile           *file);
 
 	/* Queries on icons for subclass/client.
 	 * These must be implemented => These are signals !
 	 * The default "do nothing" is not good enough.
 	 */
 	gboolean     (* get_stored_icon_position) (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *data,
+						     NautilusFile          *icon,
 						     NautilusCanvasPosition *position);
 	char *       (* get_icon_uri)             (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *data);
+						     NautilusFile          *icon);
 	char *       (* get_icon_activation_uri)  (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *data);
+						     NautilusFile          *file);
 	char *       (* get_icon_drop_target_uri) (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *data);
+						     NautilusFile          *icon);
 
 	/* If canvas data is NULL, the layout timestamp of the container should be retrieved.
 	 * That is the time when the container displayed a fully loaded directory with
@@ -168,13 +163,13 @@ typedef struct {
 	 * fully loaded directory with all canvas positions assigned.
 	 */
 	gboolean     (* get_stored_layout_timestamp) (NautilusCanvasContainer *container,
-						      NautilusCanvasIconData *data,
+						      NautilusFile           *file,
 						      time_t *time);
 	/* If canvas data is NULL, the layout timestamp of the container should be stored.
 	 * If canvas data is not NULL, the position timestamp of the container should be stored.
 	 */
 	gboolean     (* store_layout_timestamp) (NautilusCanvasContainer *container,
-						 NautilusCanvasIconData *data,
+						 NautilusFile           *file,
 						 const time_t *time);
 
 	/* Notifications for the whole container. */
@@ -185,15 +180,15 @@ typedef struct {
 
 	/* Notifications for icons. */
 	void         (* icon_position_changed)    (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *data,
+						     NautilusFile           *file,
 						     const NautilusCanvasPosition *position);
 	int	     (* preview)		  (NautilusCanvasContainer *container,
-						   NautilusCanvasIconData *data,
+						   NautilusFile            *file,
 						   gboolean start_flag);
         void         (* icon_added)               (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *data);
+						     NautilusFile          *file);
         void         (* icon_removed)             (NautilusCanvasContainer *container,
-						     NautilusCanvasIconData *data);
+						     NautilusFile          *file);
         void         (* cleared)                  (NautilusCanvasContainer *container);
 	gboolean     (* start_interactive_search) (NautilusCanvasContainer *container);
 } NautilusCanvasContainerClass;
@@ -206,25 +201,25 @@ GtkWidget *       nautilus_canvas_container_new                           (void)
 /* adding, removing, and managing icons */
 void              nautilus_canvas_container_clear                         (NautilusCanvasContainer  *view);
 gboolean          nautilus_canvas_container_add                           (NautilusCanvasContainer  *view,
-									   NautilusCanvasIconData       *data);
+									   NautilusFile             *file);
 void              nautilus_canvas_container_layout_now                    (NautilusCanvasContainer *container);
 gboolean          nautilus_canvas_container_remove                        (NautilusCanvasContainer  *view,
-									   NautilusCanvasIconData       *data);
+									   NautilusFile             *file);
 void              nautilus_canvas_container_for_each                      (NautilusCanvasContainer  *view,
 									   NautilusCanvasCallback    callback,
 									   gpointer                callback_data);
 void              nautilus_canvas_container_request_update                (NautilusCanvasContainer  *view,
-									   NautilusCanvasIconData       *data);
+									   NautilusFile             *file);
 void              nautilus_canvas_container_request_update_all            (NautilusCanvasContainer  *container);
 void              nautilus_canvas_container_reveal                        (NautilusCanvasContainer  *container,
-									   NautilusCanvasIconData       *data);
+									   NautilusFile             *file);
 gboolean          nautilus_canvas_container_is_empty                      (NautilusCanvasContainer  *container);
-NautilusCanvasIconData *nautilus_canvas_container_get_first_visible_icon        (NautilusCanvasContainer  *container);
-NautilusCanvasIconData *nautilus_canvas_container_get_focused_icon              (NautilusCanvasContainer  *container);
+NautilusFile     *nautilus_canvas_container_get_first_visible_icon        (NautilusCanvasContainer  *container);
+NautilusFile     *nautilus_canvas_container_get_focused_icon              (NautilusCanvasContainer  *container);
 GdkRectangle      *nautilus_canvas_container_get_icon_bounding_box          (NautilusCanvasContainer  *container,
-									     NautilusCanvasIconData       *data);
+									     NautilusFile             *file);
 void              nautilus_canvas_container_scroll_to_canvas                (NautilusCanvasContainer  *container,
-									     NautilusCanvasIconData       *data);
+									     NautilusFile             *datfile);
 
 void              nautilus_canvas_container_begin_loading                 (NautilusCanvasContainer  *container);
 void              nautilus_canvas_container_end_loading                   (NautilusCanvasContainer  *container,
@@ -270,7 +265,7 @@ void              nautilus_canvas_container_set_margins                   (Nauti
 									   int                     top_margin,
 									   int                     bottom_margin);
 char*             nautilus_canvas_container_get_icon_description          (NautilusCanvasContainer  *container,
-									     NautilusCanvasIconData       *data);
+									     NautilusFile           *file);
 
 gboolean	  nautilus_canvas_container_is_layout_rtl			(NautilusCanvasContainer  *container);
 
diff --git a/src/nautilus-canvas-item.c b/src/nautilus-canvas-item.c
index 6e09db5dc..a069b0493 100644
--- a/src/nautilus-canvas-item.c
+++ b/src/nautilus-canvas-item.c
@@ -1887,7 +1887,7 @@ nautilus_canvas_item_accessible_idle_do_action (gpointer data)
         {
             case ACTION_OPEN:
             {
-                file_list.data = icon->data;
+                file_list.data = icon->file;
                 file_list.next = NULL;
                 file_list.prev = NULL;
                 g_signal_emit_by_name (container, "activate", &file_list);
@@ -1902,7 +1902,7 @@ nautilus_canvas_item_accessible_idle_do_action (gpointer data)
                 selection = nautilus_canvas_container_get_selection (container);
                 if (selection == NULL ||
                     g_list_length (selection) != 1 ||
-                    selection->data != icon->data)
+                    selection->data != icon->file)
                 {
                     return FALSE;
                 }
@@ -2147,7 +2147,7 @@ nautilus_canvas_item_accessible_get_image_description (AtkImage *image)
         }
         icon = item->user_data;
         container = NAUTILUS_CANVAS_CONTAINER (EEL_CANVAS_ITEM (item)->canvas);
-        description = nautilus_canvas_container_get_icon_description (container, icon->data);
+        description = nautilus_canvas_container_get_icon_description (container, icon->file);
         g_free (priv->description);
         priv->description = description;
         return priv->description;
diff --git a/src/nautilus-canvas-private.h b/src/nautilus-canvas-private.h
index 497049560..a25c0cf4a 100644
--- a/src/nautilus-canvas-private.h
+++ b/src/nautilus-canvas-private.h
@@ -30,8 +30,7 @@
 /* An Icon. */
 
 typedef struct {
-	/* Object represented by this icon. */
-	NautilusCanvasIconData *data;
+	NautilusFile *file;
 
 	/* Canvas item for the icon. */
 	NautilusCanvasItem *item;
diff --git a/src/nautilus-canvas-view-container.c b/src/nautilus-canvas-view-container.c
index a8b1f8ad6..9771dcb8e 100644
--- a/src/nautilus-canvas-view-container.c
+++ b/src/nautilus-canvas-view-container.c
@@ -51,18 +51,15 @@ get_canvas_view (NautilusCanvasContainer *container)
 
 static NautilusIconInfo *
 nautilus_canvas_view_container_get_icon_images (NautilusCanvasContainer *container,
-                                                NautilusCanvasIconData  *data,
+                                                NautilusFile            *file,
                                                 int                      size,
                                                 gboolean                 for_drag_accept)
 {
     NautilusCanvasView *canvas_view;
-    NautilusFile *file;
     NautilusFileIconFlags flags;
     NautilusIconInfo *icon_info;
     gint scale;
 
-    file = (NautilusFile *) data;
-
     g_assert (NAUTILUS_IS_FILE (file));
     canvas_view = get_canvas_view (container);
     g_return_val_if_fail (canvas_view != NULL, NULL);
@@ -83,13 +80,11 @@ nautilus_canvas_view_container_get_icon_images (NautilusCanvasContainer *contain
 
 static char *
 nautilus_canvas_view_container_get_icon_description (NautilusCanvasContainer *container,
-                                                     NautilusCanvasIconData  *data)
+                                                     NautilusFile            *file)
 {
-    NautilusFile *file;
     char *mime_type;
     const char *description;
 
-    file = NAUTILUS_FILE (data);
     g_assert (NAUTILUS_IS_FILE (file));
 
     mime_type = nautilus_file_get_mime_type (file);
@@ -100,13 +95,10 @@ nautilus_canvas_view_container_get_icon_description (NautilusCanvasContainer *co
 
 static void
 nautilus_canvas_view_container_prioritize_thumbnailing (NautilusCanvasContainer *container,
-                                                        NautilusCanvasIconData  *data)
+                                                        NautilusFile            *file)
 {
-    NautilusFile *file;
     char *uri;
 
-    file = (NautilusFile *) data;
-
     g_assert (NAUTILUS_IS_FILE (file));
 
     if (nautilus_file_is_thumbnailing (file))
@@ -226,7 +218,7 @@ nautilus_canvas_view_container_get_icon_text_attribute_names (NautilusCanvasCont
  */
 static void
 nautilus_canvas_view_container_get_icon_text (NautilusCanvasContainer  *container,
-                                              NautilusCanvasIconData   *data,
+                                              NautilusFile             *file,
                                               char                    **editable_text,
                                               char                    **additional_text,
                                               gboolean                  include_invisible)
@@ -235,11 +227,8 @@ nautilus_canvas_view_container_get_icon_text (NautilusCanvasContainer  *containe
     char *text_array[4];
     int i, j, num_attributes;
     NautilusCanvasView *canvas_view;
-    NautilusFile *file;
     gboolean use_additional;
 
-    file = NAUTILUS_FILE (data);
-
     g_assert (NAUTILUS_IS_FILE (file));
     g_assert (editable_text != NULL);
     canvas_view = get_canvas_view (container);
@@ -302,8 +291,8 @@ nautilus_canvas_view_container_get_icon_text (NautilusCanvasContainer  *containe
 
 static int
 nautilus_canvas_view_container_compare_icons (NautilusCanvasContainer *container,
-                                              NautilusCanvasIconData  *icon_a,
-                                              NautilusCanvasIconData  *icon_b)
+                                              NautilusFile            *icon_a,
+                                              NautilusFile            *icon_b)
 {
     NautilusCanvasView *canvas_view;
 
@@ -311,21 +300,17 @@ nautilus_canvas_view_container_compare_icons (NautilusCanvasContainer *container
     g_return_val_if_fail (canvas_view != NULL, 0);
 
     /* Type unsafe comparisons for performance */
-    return nautilus_canvas_view_compare_files (canvas_view,
-                                               (NautilusFile *) icon_a,
-                                               (NautilusFile *) icon_b);
+    return nautilus_canvas_view_compare_files (canvas_view, icon_a, icon_b);
 }
 
 static int
 nautilus_canvas_view_container_compare_icons_by_name (NautilusCanvasContainer *container,
-                                                      NautilusCanvasIconData  *icon_a,
-                                                      NautilusCanvasIconData  *icon_b)
+                                                      NautilusFile            *icon_a,
+                                                      NautilusFile            *icon_b)
 {
-    return nautilus_file_compare_for_sort
-               (NAUTILUS_FILE (icon_a),
-               NAUTILUS_FILE (icon_b),
-               NAUTILUS_FILE_SORT_BY_DISPLAY_NAME,
-               FALSE, FALSE);
+    return nautilus_file_compare_for_sort (icon_a, icon_b,
+                                           NAUTILUS_FILE_SORT_BY_DISPLAY_NAME,
+                                           FALSE, FALSE);
 }
 
 static void
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index a0e076c64..451b97ba1 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -259,21 +259,21 @@ update_sort_criterion (NautilusCanvasView  *canvas_view,
 }
 
 static void
-list_covers (NautilusCanvasIconData *data,
-             gpointer                callback_data)
+list_covers (NautilusFile *file,
+             gpointer      callback_data)
 {
     GSList **file_list;
 
     file_list = callback_data;
 
-    *file_list = g_slist_prepend (*file_list, data);
+    *file_list = g_slist_prepend (*file_list, file);
 }
 
 static void
-unref_cover (NautilusCanvasIconData *data,
-             gpointer                callback_data)
+unref_cover (NautilusFile *file,
+             gpointer      callback_data)
 {
-    nautilus_file_unref (NAUTILUS_FILE (data));
+    nautilus_file_unref (file);
 }
 
 static void
@@ -329,8 +329,7 @@ nautilus_canvas_view_remove_file (NautilusFilesView *view,
 
     canvas_view = NAUTILUS_CANVAS_VIEW (view);
 
-    if (nautilus_canvas_container_remove (get_canvas_container (canvas_view),
-                                          NAUTILUS_CANVAS_ICON_DATA (file)))
+    if (nautilus_canvas_container_remove (get_canvas_container (canvas_view), file))
     {
         nautilus_file_unref (file);
     }
@@ -349,10 +348,9 @@ nautilus_canvas_view_add_files (NautilusFilesView *view,
 
     for (l = files; l != NULL; l = l->next)
     {
-        if (nautilus_canvas_container_add (canvas_container,
-                                           NAUTILUS_CANVAS_ICON_DATA (l->data)))
+        if (nautilus_canvas_container_add (canvas_container, l->data))
         {
-            nautilus_file_ref (NAUTILUS_FILE (l->data));
+            nautilus_file_ref (l->data);
         }
     }
 }
@@ -369,9 +367,7 @@ nautilus_canvas_view_file_changed (NautilusFilesView *view,
     g_return_if_fail (view != NULL);
     canvas_view = NAUTILUS_CANVAS_VIEW (view);
 
-    nautilus_canvas_container_request_update
-        (get_canvas_container (canvas_view),
-        NAUTILUS_CANVAS_ICON_DATA (file));
+    nautilus_canvas_container_request_update (get_canvas_container (canvas_view), file);
 }
 
 static const SortCriterion *
@@ -886,14 +882,14 @@ nautilus_canvas_view_reveal_selection (NautilusFilesView *view)
 }
 
 static GdkRectangle *
-get_rectangle_for_data (NautilusFilesView      *view,
-                        NautilusCanvasIconData *data)
+get_rectangle_for_file (NautilusFilesView *view,
+                        NautilusFile      *file)
 {
     NautilusCanvasContainer *container;
     GdkRectangle *rectangle;
 
     container = get_canvas_container (NAUTILUS_CANVAS_VIEW (view));
-    rectangle = nautilus_canvas_container_get_icon_bounding_box (container, data);
+    rectangle = nautilus_canvas_container_get_icon_bounding_box (container, file);
     if (rectangle != NULL)
     {
         GtkWidget *context_widget;
@@ -914,7 +910,6 @@ static GdkRectangle *
 nautilus_canvas_view_compute_rename_popover_pointing_to (NautilusFilesView *view)
 {
     g_autolist (NautilusFile) selection = NULL;
-    NautilusCanvasIconData *data;
 
     g_return_val_if_fail (NAUTILUS_IS_CANVAS_VIEW (view), NULL);
 
@@ -922,9 +917,7 @@ nautilus_canvas_view_compute_rename_popover_pointing_to (NautilusFilesView *view
     g_return_val_if_fail (selection != NULL, NULL);
 
     /* We only allow renaming one item at once */
-    data = NAUTILUS_CANVAS_ICON_DATA (selection->data);
-
-    return get_rectangle_for_data (view, data);
+    return get_rectangle_for_file (view, selection->data);
 }
 
 static GdkRectangle *
@@ -932,7 +925,7 @@ nautilus_canvas_view_reveal_for_selection_context_menu (NautilusFilesView *view)
 {
     g_autolist (NautilusFile) selection = NULL;
     NautilusCanvasContainer *container;
-    NautilusCanvasIconData *data;
+    NautilusFile *file;
 
     g_return_val_if_fail (NAUTILUS_IS_CANVAS_VIEW (view), NULL);
 
@@ -946,16 +939,16 @@ nautilus_canvas_view_reveal_for_selection_context_menu (NautilusFilesView *view)
 
     /* Get the data of the focused item, if selected. Otherwise, get the
      * data of the last selected item.*/
-    data = nautilus_canvas_container_get_focused_icon (container);
-    if (data == NULL || g_list_find (selection, NAUTILUS_FILE (data)) == NULL)
+    file = nautilus_canvas_container_get_focused_icon (container);
+    if (file == NULL || g_list_find (selection, file) == NULL)
     {
         selection = g_list_last (selection);
-        data = NAUTILUS_CANVAS_ICON_DATA (selection->data);
+        file = selection->data;
     }
 
-    nautilus_canvas_container_reveal (container, data);
+    nautilus_canvas_container_reveal (container, file);
 
-    return get_rectangle_for_data (view, data);
+    return get_rectangle_for_file (view, file);
 }
 
 static void
@@ -1442,8 +1435,7 @@ canvas_view_scroll_to_file (NautilusFilesView *view,
         file = nautilus_file_get_existing_by_uri (uri);
         if (file != NULL)
         {
-            nautilus_canvas_container_scroll_to_canvas (get_canvas_container (canvas_view),
-                                                        NAUTILUS_CANVAS_ICON_DATA (file));
+            nautilus_canvas_container_scroll_to_canvas (get_canvas_container (canvas_view), file);
             nautilus_file_unref (file);
         }
     }