]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkiconview.c
gtk/gtkstyle.c gtk/gtkcolorsel.c gtk/gtkhsv.c gtk/gtkiconview.c Update to
[~andy/gtk] / gtk / gtkiconview.c
index d9b9a13261efe569b363274c9d060fd3e3eba63c..56369f5e19dc936b19d6d173d6162a57042db508 100644 (file)
@@ -1,5 +1,5 @@
-/* eggiconlist.h
- * Copyright (C) 2002  Anders Carlsson <andersca@gnu.org>
+/* gtkiconview.c
+ * Copyright (C) 2002, 2004  Anders Carlsson <andersca@gnu.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * Boston, MA 02111-1307, USA.
  */
 
-#include "eggiconlist.h"
-
+#include <config.h>
 #include <string.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
 
-#include "eggintl.h"
-#include "eggmarshalers.h"
+#include <atk/atk.h>
+
+#include <gdk/gdkkeysyms.h>
 
+#include "gtkiconview.h"
+#include "gtkmarshalers.h"
+#include "gtkbindings.h"
+#include "gtkdnd.h"
+#include "gtkmain.h"
+#include "gtksignal.h"
+#include "gtkintl.h"
+#include "gtkaccessible.h"
+#include "gtkwindow.h"
+#include "gtktextbuffer.h"
+#include "gtkprivate.h"
+#include "gtkalias.h"
+
+#undef DEBUG_ICON_VIEW
 
-#define MINIMUM_ICON_ITEM_WIDTH 100
 #define ICON_TEXT_PADDING 3
 
-#define ICON_LIST_ITEM_DATA "egg-icon-list-item-data"
+#define GTK_ICON_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ICON_VIEW, GtkIconViewPrivate))
+#define VALID_MODEL_AND_COLUMNS(obj) ((obj)->priv->model != NULL && \
+                                      ((obj)->priv->pixbuf_column != -1 || \
+                                      (obj)->priv->text_column != -1 || \
+                                      (obj)->priv->markup_column != -1))
 
-struct _EggIconListItem
+typedef struct 
 {
-  GObject parent;
+  GtkTreeIter iter;
+  int index;
   
-  EggIconList *icon_list;
-  char *label;
-  GdkPixbuf *icon;
+  gint row, col;
 
-  GList *list;
-  
   /* Bounding boxes */
   gint x, y;
   gint width, height;
@@ -57,64 +66,76 @@ struct _EggIconListItem
 
   guint selected : 1;
   guint selected_before_rubberbanding : 1;
-};
+} GtkIconViewItem;
 
-struct _EggIconListPrivate
+struct _GtkIconViewPrivate
 {
   gint width, height;
 
+  gint text_column;
+  gint markup_column;
+  gint pixbuf_column;
+  
   GtkSelectionMode selection_mode;
 
   GdkWindow *bin_window;
 
+  GtkTreeModel *model;
+  
   GList *items;
-  GList *last_item;
-  gint item_count;
   
   GtkAdjustment *hadjustment;
   GtkAdjustment *vadjustment;
 
   guint layout_idle_id;
   
-  gboolean rubberbanding;
+  gboolean doing_rubberband;
   gint rubberband_x1, rubberband_y1;
   gint rubberband_x2, rubberband_y2;
-  
-  EggIconListItem *cursor_item;
-  
-  char *typeahead_string;
 
-  /* Sorting */
-  gboolean sorted;
-  GtkSortType sort_order;
-  
-  EggIconListItemCompareFunc sort_func;
-  gpointer sort_data;
-  GDestroyNotify sort_destroy_notify;
+  guint scroll_timeout_id;
+  gint scroll_value_diff;
+  gint event_last_x, event_last_y;
 
-  EggIconListItem *last_single_clicked;
+  GtkIconViewItem *anchor_item;
+  GtkIconViewItem *cursor_item;
+
+  guint ctrl_pressed : 1;
+  guint shift_pressed : 1;
   
+  GtkIconViewItem *last_single_clicked;
+
+#ifdef DND_WORKS
   /* Drag-and-drop. */
   gint pressed_button;
   gint press_start_x;
   gint press_start_y;
+#endif
 
   /* Layout used to draw icon text */
   PangoLayout *layout;
+  
+  GtkOrientation orientation;
+
+  gint columns;
+  gint item_width;
+  gint spacing;
+  gint row_spacing;
+  gint column_spacing;
+  gint margin;
 };
 
 /* Signals */
 enum
 {
   ITEM_ACTIVATED,
-  ITEM_ADDED,
-  ITEM_REMOVED,
   SELECTION_CHANGED,
   SELECT_ALL,
   UNSELECT_ALL,
   SELECT_CURSOR_ITEM,
   TOGGLE_CURSOR_ITEM,
   MOVE_CURSOR,
+  ACTIVATE_CURSOR_ITEM,
   LAST_SIGNAL
 };
 
@@ -122,437 +143,658 @@ enum
 enum
 {
   PROP_0,
+  PROP_PIXBUF_COLUMN,
+  PROP_TEXT_COLUMN,
+  PROP_MARKUP_COLUMN,  
   PROP_SELECTION_MODE,
-  PROP_SORTED,
-  PROP_SORT_ORDER,
+  PROP_ORIENTATION,
+  PROP_MODEL,
+  PROP_COLUMNS,
+  PROP_ITEM_WIDTH,
+  PROP_SPACING,
+  PROP_ROW_SPACING,
+  PROP_COLUMN_SPACING,
+  PROP_MARGIN
 };
 
-/* Icon List Item properties */
-enum
-{
-  PROP_ITEM_0,
-  PROP_LABEL,
-};
-
-static void egg_icon_list_class_init      (EggIconListClass *klass);
-static void egg_icon_list_init            (EggIconList      *icon_list);
-
 /* GObject signals */
-static void egg_icon_list_finalize     (GObject      *object);
-static void egg_icon_list_set_property (GObject      *object,
+static void gtk_icon_view_finalize     (GObject      *object);
+static void gtk_icon_view_set_property (GObject      *object,
                                        guint         prop_id,
                                        const GValue *value,
                                        GParamSpec   *pspec);
-static void egg_icon_list_get_property (GObject      *object,
+static void gtk_icon_view_get_property (GObject      *object,
                                        guint         prop_id,
                                        GValue       *value,
                                        GParamSpec   *pspec);
 
 
+/* GtkObject signals */
+static void gtk_icon_view_destroy (GtkObject *object);
+
 /* GtkWidget signals */
-static void     egg_icon_list_realize        (GtkWidget      *widget);
-static void     egg_icon_list_unrealize      (GtkWidget      *widget);
-static void     egg_icon_list_map            (GtkWidget      *widget);
-static void     egg_icon_list_size_request   (GtkWidget      *widget,
+static void     gtk_icon_view_realize        (GtkWidget      *widget);
+static void     gtk_icon_view_unrealize      (GtkWidget      *widget);
+static void     gtk_icon_view_map            (GtkWidget      *widget);
+static void     gtk_icon_view_size_request   (GtkWidget      *widget,
                                              GtkRequisition *requisition);
-static void     egg_icon_list_size_allocate  (GtkWidget      *widget,
+static void     gtk_icon_view_size_allocate  (GtkWidget      *widget,
                                              GtkAllocation  *allocation);
-static gboolean egg_icon_list_expose         (GtkWidget      *widget,
+static gboolean gtk_icon_view_expose         (GtkWidget      *widget,
                                              GdkEventExpose *expose);
-static gboolean egg_icon_list_motion         (GtkWidget      *widget,
+static gboolean gtk_icon_view_motion         (GtkWidget      *widget,
                                              GdkEventMotion *event);
-static gboolean egg_icon_list_button_press   (GtkWidget      *widget,
+static gboolean gtk_icon_view_button_press   (GtkWidget      *widget,
                                              GdkEventButton *event);
-static gboolean egg_icon_list_button_release (GtkWidget      *widget,
+static gboolean gtk_icon_view_button_release (GtkWidget      *widget,
                                              GdkEventButton *event);
-static gboolean egg_icon_list_key_press      (GtkWidget      *widget,
-                                             GdkEventKey    *event);
-
-
-/* EggIconList signals */
-static void     egg_icon_list_set_adjustments             (EggIconList             *icon_list,
-                                                          GtkAdjustment           *hadj,
-                                                          GtkAdjustment           *vadj);
-static void     egg_icon_list_real_select_all             (EggIconList             *icon_list);
-static void     egg_icon_list_real_unselect_all           (EggIconList             *icon_list);
-static void     egg_icon_list_real_select_cursor_item     (EggIconList             *icon_list);
-static void     egg_icon_list_real_toggle_cursor_item     (EggIconList             *icon_list);
+/* GtkIconView signals */
+static void     gtk_icon_view_set_adjustments           (GtkIconView   *icon_view,
+                                                        GtkAdjustment *hadj,
+                                                        GtkAdjustment *vadj);
+static void     gtk_icon_view_real_select_all           (GtkIconView   *icon_view);
+static void     gtk_icon_view_real_unselect_all         (GtkIconView   *icon_view);
+static void     gtk_icon_view_real_select_cursor_item   (GtkIconView   *icon_view);
+static void     gtk_icon_view_real_toggle_cursor_item   (GtkIconView   *icon_view);
+static gboolean gtk_icon_view_real_activate_cursor_item (GtkIconView   *icon_view);
 
 /* Internal functions */
-static void     egg_icon_list_adjustment_changed          (GtkAdjustment           *adjustment,
-                                                          EggIconList             *icon_list);
-static void     egg_icon_list_layout                      (EggIconList             *icon_list);
-static void     egg_icon_list_paint_item                  (EggIconList             *icon_list,
-                                                          EggIconListItem         *item,
-                                                          GdkRectangle            *area);
-static void     egg_icon_list_paint_rubberband            (EggIconList             *icon_list,
-                                                          GdkRectangle            *area);
-static void     egg_icon_list_queue_draw_item             (EggIconList             *icon_list,
-                                                          EggIconListItem         *item);
-static void     egg_icon_list_queue_layout                (EggIconList             *icon_list);
-static void     egg_icon_list_set_cursor_item             (EggIconList             *icon_list,
-                                                          EggIconListItem         *item);
-static void     egg_icon_list_append_typeahead_string     (EggIconList             *icon_list,
-                                                          const gchar             *string);
-static void     egg_icon_list_select_first_matching_item  (EggIconList             *icon_list,
-                                                          const char              *pattern);
-static void     egg_icon_list_start_rubberbanding         (EggIconList             *icon_list,
-                                                          gint                     x,
-                                                          gint                     y);
-static void     egg_icon_list_stop_rubberbanding          (EggIconList             *icon_list);
-static void     egg_icon_list_sort                        (EggIconList             *icon_list);
-static gint     egg_icon_list_sort_func                   (EggIconListItem         *a,
-                                                          EggIconListItem         *b,
-                                                          EggIconList             *icon_list);
-static void     egg_icon_list_insert_item_sorted          (EggIconList             *icon_list,
-                                                          EggIconListItem         *item);
-static void     egg_icon_list_validate                    (EggIconList             *icon_list);
-static void     egg_icon_list_update_rubberband_selection (EggIconList             *icon_list);
-static gboolean egg_icon_list_item_hit_test               (EggIconListItem         *item,
-                                                          gint                     x,
-                                                          gint                     y,
-                                                          gint                     width,
-                                                          gint                     height);
-static gboolean egg_icon_list_maybe_begin_dragging_items  (EggIconList             *icon_list,
-                                                          GdkEventMotion          *event);
-static gboolean egg_icon_list_unselect_all_internal       (EggIconList             *icon_list,
-                                                          gboolean                 emit);
-static void     egg_icon_list_calculate_item_size         (EggIconList *icon_list, EggIconListItem         *item);
-static void     rubberbanding                             (gpointer                 data);
-
-
-/* EggIconListItem functions */
-static void egg_icon_list_item_class_init   (GObjectClass    *klass);
-static void egg_icon_list_item_init         (EggIconListItem *item);
-static void egg_icon_list_item_finalize     (GObject         *object);
-static void egg_icon_list_item_set_property (GObject         *object,
-                                            guint            prop_id,
-                                            const GValue    *value,
-                                            GParamSpec      *pspec);
-static void egg_icon_list_item_get_property (GObject         *object,
-                                            guint            prop_id,
-                                            GValue          *value,
-                                            GParamSpec      *pspec);
-
-
-
-
-static void     egg_icon_list_item_invalidate_size        (EggIconListItem         *item);
+static void       gtk_icon_view_adjustment_changed          (GtkAdjustment   *adjustment,
+                                                            GtkIconView     *icon_view);
+static void       gtk_icon_view_layout                      (GtkIconView     *icon_view);
+static void       gtk_icon_view_paint_item                  (GtkIconView     *icon_view,
+                                                            cairo_t         *cr,
+                                                            GtkIconViewItem *item,
+                                                            GdkRectangle    *area);
+static void       gtk_icon_view_paint_rubberband            (GtkIconView     *icon_view,
+                                                            cairo_t         *cr,
+                                                            GdkRectangle    *area);
+static void       gtk_icon_view_queue_draw_item             (GtkIconView     *icon_view,
+                                                            GtkIconViewItem *item);
+static void       gtk_icon_view_queue_layout                (GtkIconView     *icon_view);
+static void       gtk_icon_view_set_cursor_item             (GtkIconView     *icon_view,
+                                                            GtkIconViewItem *item);
+static void       gtk_icon_view_start_rubberbanding         (GtkIconView     *icon_view,
+                                                            gint             x,
+                                                            gint             y);
+static void       gtk_icon_view_stop_rubberbanding          (GtkIconView     *icon_view);
+static void       gtk_icon_view_update_rubberband_selection (GtkIconView     *icon_view);
+static gboolean   gtk_icon_view_item_hit_test               (GtkIconViewItem *item,
+                                                            gint             x,
+                                                            gint             y,
+                                                            gint             width,
+                                                            gint             height);
+#ifdef DND_WORKS
+static gboolean   gtk_icon_view_maybe_begin_dragging_items  (GtkIconView     *icon_view,
+                                                            GdkEventMotion  *event);
+#endif
+static gboolean   gtk_icon_view_unselect_all_internal       (GtkIconView     *icon_view);
+static void       gtk_icon_view_calculate_item_size         (GtkIconView     *icon_view,
+                                                            GtkIconViewItem *item,
+                                                            gint             item_width);
+static void       gtk_icon_view_update_rubberband           (gpointer         data);
+static void       gtk_icon_view_item_invalidate_size        (GtkIconViewItem *item);
+static void       gtk_icon_view_invalidate_sizes            (GtkIconView     *icon_view);
+static void       gtk_icon_view_add_move_binding            (GtkBindingSet   *binding_set,
+                                                            guint            keyval,
+                                                            guint            modmask,
+                                                            GtkMovementStep  step,
+                                                            gint             count);
+static gboolean   gtk_icon_view_real_move_cursor            (GtkIconView     *icon_view,
+                                                            GtkMovementStep  step,
+                                                            gint             count);
+static void       gtk_icon_view_move_cursor_up_down         (GtkIconView     *icon_view,
+                                                            gint             count);
+static void       gtk_icon_view_move_cursor_page_up_down    (GtkIconView     *icon_view,
+                                                            gint             count);
+static void       gtk_icon_view_move_cursor_left_right      (GtkIconView     *icon_view,
+                                                            gint             count);
+static void       gtk_icon_view_move_cursor_start_end       (GtkIconView     *icon_view,
+                                                            gint             count);
+static void       gtk_icon_view_scroll_to_item              (GtkIconView     *icon_view,
+                                                            GtkIconViewItem *item);
+static GdkPixbuf *gtk_icon_view_get_item_icon               (GtkIconView     *icon_view,
+                                                            GtkIconViewItem *item);
+static void       gtk_icon_view_update_item_text            (GtkIconView     *icon_view,
+                                                            GtkIconViewItem *item);
+static void       gtk_icon_view_select_item                 (GtkIconView     *icon_view,
+                                                            GtkIconViewItem *item);
+static void       gtk_icon_view_unselect_item               (GtkIconView     *icon_view,
+                                                            GtkIconViewItem *item);
+static gboolean gtk_icon_view_select_all_between            (GtkIconView     *icon_view,
+                                                            GtkIconViewItem *anchor,
+                                                            GtkIconViewItem *cursor);
+
+static GtkIconViewItem *gtk_icon_view_get_item_at_pos (GtkIconView *icon_view,
+                                                      gint         x,
+                                                      gint         y);
+
+
+/* Accessibility Support */
+static AtkObject       *gtk_icon_view_get_accessible  (GtkWidget   *widget);
 
 static GtkContainerClass *parent_class = NULL;
-static GObjectClass *item_parent_class = NULL;
-static guint icon_list_signals[LAST_SIGNAL] = { 0 };
-
-GType
-egg_icon_list_item_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info =
-       {
-         sizeof (GObjectClass),
-         NULL,         /* base_init */
-         NULL,         /* base_finalize */
-         (GClassInitFunc) egg_icon_list_item_class_init,
-         NULL,         /* class_finalize */
-         NULL,         /* class_data */
-         sizeof (EggIconListItem),
-         0,              /* n_preallocs */
-         (GInstanceInitFunc) egg_icon_list_item_init
-       };
-
-      object_type = g_type_register_static (G_TYPE_OBJECT, "EggIconListItem", &object_info, 0);
-    }
+static guint icon_view_signals[LAST_SIGNAL] = { 0 };
 
-  return object_type;
-}
-
-GType
-egg_icon_list_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info =
-       {         
-         sizeof (EggIconListClass),
-         NULL,         /* base_init */
-         NULL,         /* base_finalize */
-         (GClassInitFunc) egg_icon_list_class_init,
-         NULL,         /* class_finalize */
-         NULL,         /* class_data */
-         sizeof (EggIconList),
-         0,              /* n_preallocs */
-         (GInstanceInitFunc) egg_icon_list_init
-       };
-
-      object_type = g_type_register_static (GTK_TYPE_CONTAINER, "EggIconList", &object_info, 0);
-    }
-
-  return object_type;
-}
+G_DEFINE_TYPE (GtkIconView, gtk_icon_view, GTK_TYPE_CONTAINER);
 
 static void
-egg_icon_list_class_init (EggIconListClass *klass)
+gtk_icon_view_class_init (GtkIconViewClass *klass)
 {
   GObjectClass *gobject_class;
+  GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
   GtkBindingSet *binding_set;
   
   parent_class = g_type_class_peek_parent (klass);
   binding_set = gtk_binding_set_by_class (klass);
-  
+
+  g_type_class_add_private (klass, sizeof (GtkIconViewPrivate));
+
   gobject_class = (GObjectClass *) klass;
+  object_class = (GtkObjectClass *) klass;
   widget_class = (GtkWidgetClass *) klass;
 
-  gobject_class->finalize = egg_icon_list_finalize;
-  gobject_class->set_property = egg_icon_list_set_property;
-  gobject_class->get_property = egg_icon_list_get_property;
-
-  widget_class->realize = egg_icon_list_realize;
-  widget_class->unrealize = egg_icon_list_unrealize;
-  widget_class->map = egg_icon_list_map;
-  widget_class->size_request = egg_icon_list_size_request;
-  widget_class->size_allocate = egg_icon_list_size_allocate;
-  widget_class->expose_event = egg_icon_list_expose;
-  widget_class->motion_notify_event = egg_icon_list_motion;
-  widget_class->button_press_event = egg_icon_list_button_press;
-  widget_class->button_release_event = egg_icon_list_button_release;
-  widget_class->key_press_event = egg_icon_list_key_press;
-  
-  klass->set_scroll_adjustments = egg_icon_list_set_adjustments;
-  klass->select_all = egg_icon_list_real_select_all;
-  klass->unselect_all = egg_icon_list_real_unselect_all;
-  klass->select_cursor_item = egg_icon_list_real_select_cursor_item;
-  klass->toggle_cursor_item = egg_icon_list_real_toggle_cursor_item;
+  gobject_class->finalize = gtk_icon_view_finalize;
+  gobject_class->set_property = gtk_icon_view_set_property;
+  gobject_class->get_property = gtk_icon_view_get_property;
+
+  object_class->destroy = gtk_icon_view_destroy;
+  
+  widget_class->realize = gtk_icon_view_realize;
+  widget_class->unrealize = gtk_icon_view_unrealize;
+  widget_class->map = gtk_icon_view_map;
+  widget_class->size_request = gtk_icon_view_size_request;
+  widget_class->size_allocate = gtk_icon_view_size_allocate;
+  widget_class->expose_event = gtk_icon_view_expose;
+  widget_class->motion_notify_event = gtk_icon_view_motion;
+  widget_class->button_press_event = gtk_icon_view_button_press;
+  widget_class->button_release_event = gtk_icon_view_button_release;
+  widget_class->get_accessible = gtk_icon_view_get_accessible;
+
+  klass->set_scroll_adjustments = gtk_icon_view_set_adjustments;
+  klass->select_all = gtk_icon_view_real_select_all;
+  klass->unselect_all = gtk_icon_view_real_unselect_all;
+  klass->select_cursor_item = gtk_icon_view_real_select_cursor_item;
+  klass->toggle_cursor_item = gtk_icon_view_real_toggle_cursor_item;
+  klass->activate_cursor_item = gtk_icon_view_real_activate_cursor_item;  
+  klass->move_cursor = gtk_icon_view_real_move_cursor;
   
   /* Properties */
+  /**
+   * GtkIconView:selection-mode:
+   * 
+   * The ::selection-mode property specifies the selection mode of
+   * icon view. If the mode is #GTK_SELECTION_MULTIPLE, rubberband selection
+   * is enabled, for the other modes, only keyboard selection is possible.
+   *
+   * Since: 2.6
+   */
   g_object_class_install_property (gobject_class,
                                   PROP_SELECTION_MODE,
-                                  g_param_spec_enum ("selection_mode",
-                                                     _("Selection mode"),
-                                                     _("The selection mode"),
+                                  g_param_spec_enum ("selection-mode",
+                                                     P_("Selection mode"),
+                                                     P_("The selection mode"),
                                                      GTK_TYPE_SELECTION_MODE,
                                                      GTK_SELECTION_SINGLE,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
+
+  /**
+   * GtkIconView:pixbuf-column:
+   *
+   * The ::pixbuf-column property contains the number of the model column
+   * containing the pixbufs which are displayed. The pixbuf column must be 
+   * of type #GDK_TYPE_PIXBUF. Setting this property to -1 turns off the
+   * display of pixbufs.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_PIXBUF_COLUMN,
+                                  g_param_spec_int ("pixbuf-column",
+                                                    P_("Pixbuf column"),
+                                                    P_("Model column used to retrieve the icon pixbuf from"),
+                                                    -1, G_MAXINT, -1,
+                                                    GTK_PARAM_READWRITE));
+
+  /**
+   * GtkIconView:text-column:
+   *
+   * The ::text-column property contains the number of the model column
+   * containing the texts which are displayed. The text column must be 
+   * of type #G_TYPE_STRING. If this property and the :markup-column 
+   * property are both set to -1, no texts are displayed.   
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_TEXT_COLUMN,
+                                  g_param_spec_int ("text-column",
+                                                    P_("Text column"),
+                                                    P_("Model column used to retrieve the text from"),
+                                                    -1, G_MAXINT, -1,
+                                                    GTK_PARAM_READWRITE));
 
+  
+  /**
+   * GtkIconView:markup-column:
+   *
+   * The ::markup-column property contains the number of the model column
+   * containing markup information to be displayed. The markup column must be 
+   * of type #G_TYPE_STRING. If this property and the :text-column property 
+   * are both set to column numbers, it overrides the text column.
+   * If both are set to -1, no texts are displayed.   
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_MARKUP_COLUMN,
+                                  g_param_spec_int ("markup-column",
+                                                    P_("Markup column"),
+                                                    P_("Model column used to retrieve the text if using Pango markup"),
+                                                    -1, G_MAXINT, -1,
+                                                    GTK_PARAM_READWRITE));
+  
   g_object_class_install_property (gobject_class,
-                                  PROP_SORTED,
-                                  g_param_spec_boolean ("sorted",
-                                                        _("Sorted"),
-                                                        _("Icon list is sorted"),
-                                                        FALSE,
-                                                        G_PARAM_READWRITE));
+                                   PROP_MODEL,
+                                   g_param_spec_object ("model",
+                                                       P_("Icon View Model"),
+                                                       P_("The model for the icon view"),
+                                                       GTK_TYPE_TREE_MODEL,
+                                                       GTK_PARAM_READWRITE));
+  
+  /**
+   * GtkIconView:columns:
+   *
+   * The columns property contains the number of the columns in which the
+   * items should be displayed. If it is -1, the number of columns will
+   * be chosen automatically to fill the available area.
+   *
+   * Since: 2.6
+   */
   g_object_class_install_property (gobject_class,
-                                   PROP_SORT_ORDER,
-                                   g_param_spec_enum ("sort_order",
-                                                      _("Sort order"),
-                                                      _("Sort direction the icon list should use"),
-                                                      GTK_TYPE_SORT_TYPE,
-                                                      GTK_SORT_ASCENDING,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                  PROP_COLUMNS,
+                                  g_param_spec_int ("columns",
+                                                    P_("Number of columns"),
+                                                    P_("Number of columns to display"),
+                                                    -1, G_MAXINT, -1,
+                                                    GTK_PARAM_READWRITE));
+  
 
-  /* Style properties */
-#define _ICON_LIST_TOP_MARGIN 6
-#define _ICON_LIST_BOTTOM_MARGIN 6
-#define _ICON_LIST_LEFT_MARGIN 6
-#define _ICON_LIST_RIGHT_MARGIN 6
-#define _ICON_LIST_ICON_PADDING 6
+  /**
+   * GtkIconView::item-width:
+   *
+   * The item-width property specifies the width to use for each item. 
+   * If it is set to -1, the icon view will automatically determine a 
+   * suitable item size.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_ITEM_WIDTH,
+                                  g_param_spec_int ("item-width",
+                                                    P_("Width for each item"),
+                                                    P_("The width used for each item"),
+                                                    -1, G_MAXINT, -1,
+                                                    GTK_PARAM_READWRITE));  
+
+  /**
+   * GtkIconView::spacing:
+   *
+   * The spacing property specifies the space which is inserted between
+   * the cells (i.e. the icon and the text) of an item.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_SPACING,
+                                   g_param_spec_int ("spacing",
+                                                    P_("Spacing"),
+                                                    P_("Space which is inserted between cells of an item"),
+                                                    0, G_MAXINT, 0,
+                                                    GTK_PARAM_READWRITE));
+
+  /**
+   * GtkIconView::row-spacing:
+   *
+   * The row-spacing property specifies the space which is inserted between
+   * the rows of the icon view.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_ROW_SPACING,
+                                   g_param_spec_int ("row-spacing",
+                                                    P_("Row Spacing"),
+                                                    P_("Space which is inserted between grid rows"),
+                                                    0, G_MAXINT, 6,
+                                                    GTK_PARAM_READWRITE));
+
+  /**
+   * GtkIconView::column-spacing:
+   *
+   * The column-spacing property specifies the space which is inserted between
+   * the columns of the icon view.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_COLUMN_SPACING,
+                                   g_param_spec_int ("column-spacing",
+                                                    P_("Column Spacing"),
+                                                    P_("Space which is inserted between grid column"),
+                                                    0, G_MAXINT, 6,
+                                                    GTK_PARAM_READWRITE));
+
+  /**
+   * GtkIconView::margin:
+   *
+   * The margin property specifies the space which is inserted 
+   * at the edges of the icon view.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_MARGIN,
+                                   g_param_spec_int ("margin",
+                                                    P_("Margin"),
+                                                    P_("Space which is inserted at the edges of the icon view"),
+                                                    0, G_MAXINT, 6,
+                                                    GTK_PARAM_READWRITE));
+
+
+  /**
+   * GtkIconView::orientation:
+   *
+   * The orientation property specifies how the cells (i.e. the icon and 
+   * the text) of the item are positioned relative to each other.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_ORIENTATION,
+                                  g_param_spec_enum ("orientation",
+                                                     P_("Orientation"),
+                                                     P_("How the text and icon of each item are positioned relative to each other"),
+                                                     GTK_TYPE_ORIENTATION,
+                                                     GTK_ORIENTATION_VERTICAL,
+                                                     GTK_PARAM_READWRITE));
 
+  /* Style properties */
   gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("icon_padding",
-                                                            _("Icon padding"),
-                                                            _("Number of pixels between icons"),
-                                                            0,
-                                                            G_MAXINT,
-                                                            _ICON_LIST_ICON_PADDING,
-                                                            G_PARAM_READABLE));
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("top_margin",
-                                                            _("Top margin"),
-                                                            _("Number of pixels in top margin"),
-                                                            0,
-                                                            G_MAXINT,
-                                                            _ICON_LIST_TOP_MARGIN,
-                                                            G_PARAM_READABLE));
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("bottom_margin",
-                                                            _("Bottom margin"),
-                                                            _("Number of pixels in bottom margin"),
-                                                            0,
-                                                            G_MAXINT,
-                                                            _ICON_LIST_BOTTOM_MARGIN,
-                                                            G_PARAM_READABLE));
+                                           g_param_spec_boxed ("selection-box-color",
+                                                               P_("Selection Box Color"),
+                                                               P_("Color of the selection box"),
+                                                               GDK_TYPE_COLOR,
+                                                               GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("left_margin",
-                                                            _("Left margin"),
-                                                            _("Number of pixels in left margin"),
-                                                            0,
-                                                            G_MAXINT,
-                                                            _ICON_LIST_LEFT_MARGIN,
-                                                            G_PARAM_READABLE));
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("right_margin",
-                                                            _("Right margin"),
-                                                            _("Number of pixels in right margin"),
-                                                            0,
-                                                            G_MAXINT,
-                                                            _ICON_LIST_RIGHT_MARGIN,
-                                                            G_PARAM_READABLE));
+                                           g_param_spec_uchar ("selection-box-alpha",
+                                                               P_("Selection Box Alpha"),
+                                                               P_("Opacity of the selection box"),
+                                                               0, 0xff,
+                                                               0x40,
+                                                               GTK_PARAM_READABLE));
 
   /* Signals */
   widget_class->set_scroll_adjustments_signal =
     g_signal_new ("set_scroll_adjustments",
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
-                 G_STRUCT_OFFSET (EggIconListClass, set_scroll_adjustments),
+                 G_STRUCT_OFFSET (GtkIconViewClass, set_scroll_adjustments),
                  NULL, NULL, 
-                 _egg_marshal_VOID__OBJECT_OBJECT,
+                 _gtk_marshal_VOID__OBJECT_OBJECT,
                  G_TYPE_NONE, 2,
                  GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 
-  icon_list_signals[ITEM_ACTIVATED] =
+  icon_view_signals[ITEM_ACTIVATED] =
     g_signal_new ("item_activated",
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
-                 G_STRUCT_OFFSET (EggIconListClass, item_activated),
+                 G_STRUCT_OFFSET (GtkIconViewClass, item_activated),
                  NULL, NULL,
-                 g_cclosure_marshal_VOID__OBJECT,
+                 g_cclosure_marshal_VOID__BOXED,
                  G_TYPE_NONE, 1,
-                 EGG_TYPE_ICON_LIST_ITEM);
+                 GTK_TYPE_TREE_PATH);
 
-  icon_list_signals[SELECTION_CHANGED] =
+  icon_view_signals[SELECTION_CHANGED] =
     g_signal_new ("selection_changed",
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
-                 G_STRUCT_OFFSET (EggIconListClass, selection_changed),
+                 G_STRUCT_OFFSET (GtkIconViewClass, selection_changed),
                  NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   
-  icon_list_signals[ITEM_ADDED] =
-    g_signal_new ("item_added",
-                 G_TYPE_FROM_CLASS (gobject_class),
-                 G_SIGNAL_RUN_LAST,
-                 G_STRUCT_OFFSET (EggIconListClass, item_added),
-                 NULL, NULL,
-                 g_cclosure_marshal_VOID__OBJECT,
-                 G_TYPE_NONE, 1, EGG_TYPE_ICON_LIST_ITEM);
-
-  icon_list_signals[ITEM_REMOVED] =
-    g_signal_new ("item_removed",
-                 G_TYPE_FROM_CLASS (gobject_class),
-                 G_SIGNAL_RUN_LAST,
-                 G_STRUCT_OFFSET (EggIconListClass, item_removed),
-                 NULL, NULL,
-                 g_cclosure_marshal_VOID__OBJECT,
-                 G_TYPE_NONE, 1, EGG_TYPE_ICON_LIST_ITEM);
-  
-  icon_list_signals[SELECT_ALL] =
+  icon_view_signals[SELECT_ALL] =
     g_signal_new ("select_all",
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                 G_STRUCT_OFFSET (EggIconListClass, select_all),
+                 G_STRUCT_OFFSET (GtkIconViewClass, select_all),
                  NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   
-  icon_list_signals[UNSELECT_ALL] =
+  icon_view_signals[UNSELECT_ALL] =
     g_signal_new ("unselect_all",
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                 G_STRUCT_OFFSET (EggIconListClass, unselect_all),
+                 G_STRUCT_OFFSET (GtkIconViewClass, unselect_all),
                  NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 
-  icon_list_signals[SELECT_CURSOR_ITEM] =
+  icon_view_signals[SELECT_CURSOR_ITEM] =
     g_signal_new ("select_cursor_item",
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                 G_STRUCT_OFFSET (EggIconListClass, select_cursor_item),
+                 G_STRUCT_OFFSET (GtkIconViewClass, select_cursor_item),
                  NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 
-  icon_list_signals[SELECT_CURSOR_ITEM] =
+  icon_view_signals[TOGGLE_CURSOR_ITEM] =
     g_signal_new ("toggle_cursor_item",
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                 G_STRUCT_OFFSET (EggIconListClass, toggle_cursor_item),
+                 G_STRUCT_OFFSET (GtkIconViewClass, toggle_cursor_item),
                  NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 
+  icon_view_signals[ACTIVATE_CURSOR_ITEM] =
+    g_signal_new ("activate_cursor_item",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                 G_STRUCT_OFFSET (GtkIconViewClass, activate_cursor_item),
+                 NULL, NULL,
+                 _gtk_marshal_BOOLEAN__VOID,
+                 G_TYPE_BOOLEAN, 0);
+  
+  icon_view_signals[MOVE_CURSOR] =
+    g_signal_new ("move_cursor",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                 G_STRUCT_OFFSET (GtkIconViewClass, move_cursor),
+                 NULL, NULL,
+                 _gtk_marshal_BOOLEAN__ENUM_INT,
+                 G_TYPE_BOOLEAN, 2,
+                 GTK_TYPE_MOVEMENT_STEP,
+                 G_TYPE_INT);
+
   /* Key bindings */
   gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK, "select_all", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "unselect_all", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_space, 0, "select_cursor_item", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, "toggle_cursor_item", 0);
-}
 
+  gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, "activate_cursor_item", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0, "activate_cursor_item", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, "activate_cursor_item", 0);
+
+  gtk_icon_view_add_move_binding (binding_set, GDK_Up, 0,
+                                 GTK_MOVEMENT_DISPLAY_LINES, -1);
+  gtk_icon_view_add_move_binding (binding_set, GDK_KP_Up, 0,
+                                 GTK_MOVEMENT_DISPLAY_LINES, -1);
+
+  gtk_icon_view_add_move_binding (binding_set, GDK_Down, 0,
+                                 GTK_MOVEMENT_DISPLAY_LINES, 1);
+  gtk_icon_view_add_move_binding (binding_set, GDK_KP_Down, 0,
+                                 GTK_MOVEMENT_DISPLAY_LINES, 1);
+
+  gtk_icon_view_add_move_binding (binding_set, GDK_p, GDK_CONTROL_MASK,
+                                 GTK_MOVEMENT_DISPLAY_LINES, -1);
+
+  gtk_icon_view_add_move_binding (binding_set, GDK_n, GDK_CONTROL_MASK,
+                                 GTK_MOVEMENT_DISPLAY_LINES, 1);
+
+  gtk_icon_view_add_move_binding (binding_set, GDK_Home, 0,
+                                 GTK_MOVEMENT_BUFFER_ENDS, -1);
+  gtk_icon_view_add_move_binding (binding_set, GDK_KP_Home, 0,
+                                 GTK_MOVEMENT_BUFFER_ENDS, -1);
+
+  gtk_icon_view_add_move_binding (binding_set, GDK_End, 0,
+                                 GTK_MOVEMENT_BUFFER_ENDS, 1);
+  gtk_icon_view_add_move_binding (binding_set, GDK_KP_End, 0,
+                                 GTK_MOVEMENT_BUFFER_ENDS, 1);
+
+  gtk_icon_view_add_move_binding (binding_set, GDK_Page_Up, 0,
+                                 GTK_MOVEMENT_PAGES, -1);
+  gtk_icon_view_add_move_binding (binding_set, GDK_KP_Page_Up, 0,
+                                 GTK_MOVEMENT_PAGES, -1);
+
+  gtk_icon_view_add_move_binding (binding_set, GDK_Page_Down, 0,
+                                 GTK_MOVEMENT_PAGES, 1);
+  gtk_icon_view_add_move_binding (binding_set, GDK_KP_Page_Down, 0,
+                                 GTK_MOVEMENT_PAGES, 1);
+
+  gtk_icon_view_add_move_binding (binding_set, GDK_Right, 0, 
+                                 GTK_MOVEMENT_VISUAL_POSITIONS, 1);
+  gtk_icon_view_add_move_binding (binding_set, GDK_Left, 0, 
+                                 GTK_MOVEMENT_VISUAL_POSITIONS, -1);
+
+  gtk_icon_view_add_move_binding (binding_set, GDK_KP_Right, 0, 
+                                 GTK_MOVEMENT_VISUAL_POSITIONS, 1);
+  gtk_icon_view_add_move_binding (binding_set, GDK_KP_Left, 0, 
+                                 GTK_MOVEMENT_VISUAL_POSITIONS, -1);
+}
 
 static void
-egg_icon_list_init (EggIconList *icon_list)
+gtk_icon_view_init (GtkIconView *icon_view)
 {
-  icon_list->priv = g_new0 (EggIconListPrivate, 1);
-  GTK_WIDGET_SET_FLAGS (icon_list, GTK_CAN_FOCUS);
+  icon_view->priv = GTK_ICON_VIEW_GET_PRIVATE (icon_view);
+  
+  icon_view->priv->width = 0;
+  icon_view->priv->height = 0;
+  icon_view->priv->selection_mode = GTK_SELECTION_SINGLE;
+#ifdef DND_WORKS
+  icon_view->priv->pressed_button = -1;
+  icon_view->priv->press_start_x = -1;
+  icon_view->priv->press_start_y = -1;
+#endif
+  icon_view->priv->text_column = -1;
+  icon_view->priv->markup_column = -1;  
+  icon_view->priv->pixbuf_column = -1;
+  
+  icon_view->priv->layout = gtk_widget_create_pango_layout (GTK_WIDGET (icon_view), NULL);
+
+  pango_layout_set_wrap (icon_view->priv->layout, PANGO_WRAP_WORD_CHAR);
 
-  icon_list->priv->width = 0;
-  icon_list->priv->height = 0;
-  icon_list->priv->selection_mode = GTK_SELECTION_SINGLE;
-  icon_list->priv->sort_order = GTK_SORT_ASCENDING;
-  icon_list->priv->pressed_button = -1;
-  icon_list->priv->press_start_x = -1;
-  icon_list->priv->press_start_y = -1;
-  icon_list->priv->layout = gtk_widget_create_pango_layout (GTK_WIDGET (icon_list), NULL);
+  GTK_WIDGET_SET_FLAGS (icon_view, GTK_CAN_FOCUS);
   
-  egg_icon_list_set_adjustments (icon_list, NULL, NULL);
+  gtk_icon_view_set_adjustments (icon_view, NULL, NULL);
+
+  icon_view->priv->orientation = GTK_ORIENTATION_VERTICAL;
+
+  icon_view->priv->columns = -1;
+  icon_view->priv->item_width = -1;
+  icon_view->priv->spacing = 0;
+  icon_view->priv->row_spacing = 6;
+  icon_view->priv->column_spacing = 6;
+  icon_view->priv->margin = 6;
 }
 
+static void
+gtk_icon_view_destroy (GtkObject *object)
+{
+  GtkIconView *icon_view;
+
+  icon_view = GTK_ICON_VIEW (object);
+  
+  gtk_icon_view_set_model (icon_view, NULL);
+  
+  if (icon_view->priv->layout_idle_id != 0)
+    g_source_remove (icon_view->priv->layout_idle_id);
+
+  if (icon_view->priv->scroll_timeout_id != 0)
+    g_source_remove (icon_view->priv->scroll_timeout_id);
+  
+  (GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
 
 /* GObject methods */
 static void
-egg_icon_list_finalize (GObject *object)
+gtk_icon_view_finalize (GObject *object)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
 
-  icon_list = EGG_ICON_LIST (object);
+  icon_view = GTK_ICON_VIEW (object);
 
-  if (icon_list->priv->layout_idle_id != 0)
-    g_source_remove (icon_list->priv->layout_idle_id);
-
-  g_free (icon_list->priv);
+  g_object_unref (icon_view->priv->layout);
   
   (G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
 
 static void
-egg_icon_list_set_property (GObject      *object,
+gtk_icon_view_set_property (GObject      *object,
                            guint         prop_id,
                            const GValue *value,
                            GParamSpec   *pspec)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
 
-  icon_list = EGG_ICON_LIST (object);
+  icon_view = GTK_ICON_VIEW (object);
 
   switch (prop_id)
     {
     case PROP_SELECTION_MODE:
-      egg_icon_list_set_selection_mode (icon_list, g_value_get_enum (value));
+      gtk_icon_view_set_selection_mode (icon_view, g_value_get_enum (value));
+      break;
+    case PROP_PIXBUF_COLUMN:
+      gtk_icon_view_set_pixbuf_column (icon_view, g_value_get_int (value));
+      break;
+    case PROP_TEXT_COLUMN:
+      gtk_icon_view_set_text_column (icon_view, g_value_get_int (value));
+      break;
+    case PROP_MARKUP_COLUMN:
+      gtk_icon_view_set_markup_column (icon_view, g_value_get_int (value));
+      break;
+    case PROP_MODEL:
+      gtk_icon_view_set_model (icon_view, g_value_get_object (value));
+      break;
+    case PROP_ORIENTATION:
+      gtk_icon_view_set_orientation (icon_view, g_value_get_enum (value));
+      break;
+    case PROP_COLUMNS:
+      gtk_icon_view_set_columns (icon_view, g_value_get_int (value));
+      break;
+    case PROP_ITEM_WIDTH:
+      gtk_icon_view_set_item_width (icon_view, g_value_get_int (value));
       break;
-    case PROP_SORTED:
-      egg_icon_list_set_sorted (icon_list, g_value_get_boolean (value));
+    case PROP_SPACING:
+      gtk_icon_view_set_spacing (icon_view, g_value_get_int (value));
       break;
-    case PROP_SORT_ORDER:
-      egg_icon_list_set_sort_order (icon_list, g_value_get_enum (value));
+    case PROP_ROW_SPACING:
+      gtk_icon_view_set_row_spacing (icon_view, g_value_get_int (value));
       break;
+    case PROP_COLUMN_SPACING:
+      gtk_icon_view_set_column_spacing (icon_view, g_value_get_int (value));
+      break;
+    case PROP_MARGIN:
+      gtk_icon_view_set_margin (icon_view, g_value_get_int (value));
+      break;
+      
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -560,26 +802,54 @@ egg_icon_list_set_property (GObject      *object,
 }
 
 static void
-egg_icon_list_get_property (GObject      *object,
+gtk_icon_view_get_property (GObject      *object,
                            guint         prop_id,
                            GValue       *value,
                            GParamSpec   *pspec)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
 
-  icon_list = EGG_ICON_LIST (object);
+  icon_view = GTK_ICON_VIEW (object);
 
   switch (prop_id)
     {
     case PROP_SELECTION_MODE:
-      g_value_set_enum (value, icon_list->priv->selection_mode);
+      g_value_set_enum (value, icon_view->priv->selection_mode);
+      break;
+    case PROP_PIXBUF_COLUMN:
+      g_value_set_int (value, icon_view->priv->pixbuf_column);
+      break;
+    case PROP_TEXT_COLUMN:
+      g_value_set_int (value, icon_view->priv->text_column);
+      break;
+    case PROP_MARKUP_COLUMN:
+      g_value_set_int (value, icon_view->priv->markup_column);
+      break;
+    case PROP_MODEL:
+      g_value_set_object (value, icon_view->priv->model);
+      break;
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, icon_view->priv->orientation);
       break;
-    case PROP_SORTED:
-      g_value_set_boolean (value, icon_list->priv->sorted);
+    case PROP_COLUMNS:
+      g_value_set_int (value, icon_view->priv->columns);
       break;
-    case PROP_SORT_ORDER:
-      g_value_set_enum (value, icon_list->priv->sort_order);
+    case PROP_ITEM_WIDTH:
+      g_value_set_int (value, icon_view->priv->item_width);
       break;
+    case PROP_SPACING:
+      g_value_set_int (value, icon_view->priv->spacing);
+      break;
+    case PROP_ROW_SPACING:
+      g_value_set_int (value, icon_view->priv->row_spacing);
+      break;
+    case PROP_COLUMN_SPACING:
+      g_value_set_int (value, icon_view->priv->column_spacing);
+      break;
+    case PROP_MARGIN:
+      g_value_set_int (value, icon_view->priv->margin);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -588,13 +858,13 @@ egg_icon_list_get_property (GObject      *object,
 
 /* GtkWidget signals */
 static void
-egg_icon_list_realize (GtkWidget *widget)
+gtk_icon_view_realize (GtkWidget *widget)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
   GdkWindowAttr attributes;
   gint attributes_mask;
   
-  icon_list = EGG_ICON_LIST (widget);
+  icon_view = GTK_ICON_VIEW (widget);
 
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
@@ -615,11 +885,11 @@ egg_icon_list_realize (GtkWidget *widget)
                                   &attributes, attributes_mask);
   gdk_window_set_user_data (widget->window, widget);
 
-  /* Make the window for the icon list */
+  /* Make the window for the icon view */
   attributes.x = 0;
   attributes.y = 0;
-  attributes.width = MAX (icon_list->priv->width, widget->allocation.width);
-  attributes.height = MAX (icon_list->priv->height, widget->allocation.height);
+  attributes.width = MAX (icon_view->priv->width, widget->allocation.width);
+  attributes.height = MAX (icon_view->priv->height, widget->allocation.height);
   attributes.event_mask = (GDK_EXPOSURE_MASK |
                           GDK_SCROLL_MASK |
                           GDK_POINTER_MOTION_MASK |
@@ -629,27 +899,25 @@ egg_icon_list_realize (GtkWidget *widget)
                           GDK_KEY_RELEASE_MASK) |
     gtk_widget_get_events (widget);
   
-  icon_list->priv->bin_window = gdk_window_new (widget->window,
-                                         &attributes, attributes_mask);
-  gdk_window_set_user_data (icon_list->priv->bin_window, widget);
+  icon_view->priv->bin_window = gdk_window_new (widget->window,
+                                               &attributes, attributes_mask);
+  gdk_window_set_user_data (icon_view->priv->bin_window, widget);
 
   widget->style = gtk_style_attach (widget->style, widget->window);
-  gdk_window_set_background (icon_list->priv->bin_window, &widget->style->base[widget->state]);
+  gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]);
   gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
-
-  
 }
 
 static void
-egg_icon_list_unrealize (GtkWidget *widget)
+gtk_icon_view_unrealize (GtkWidget *widget)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
 
-  icon_list = EGG_ICON_LIST (widget);
+  icon_view = GTK_ICON_VIEW (widget);
 
-  gdk_window_set_user_data (icon_list->priv->bin_window, NULL);
-  gdk_window_destroy (icon_list->priv->bin_window);
-  icon_list->priv->bin_window = NULL;
+  gdk_window_set_user_data (icon_view->priv->bin_window, NULL);
+  gdk_window_destroy (icon_view->priv->bin_window);
+  icon_view->priv->bin_window = NULL;
 
   /* GtkWidget::unrealize destroys children and widget->window */
   if (GTK_WIDGET_CLASS (parent_class)->unrealize)
@@ -657,81 +925,97 @@ egg_icon_list_unrealize (GtkWidget *widget)
 }
 
 static void
-egg_icon_list_map (GtkWidget *widget)
+gtk_icon_view_map (GtkWidget *widget)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
 
-  icon_list = EGG_ICON_LIST (widget);
+  icon_view = GTK_ICON_VIEW (widget);
 
   GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
 
-  gdk_window_show (icon_list->priv->bin_window);
+  gdk_window_show (icon_view->priv->bin_window);
   gdk_window_show (widget->window);
 }
 
 static void
-egg_icon_list_size_request (GtkWidget      *widget,
+gtk_icon_view_size_request (GtkWidget      *widget,
                            GtkRequisition *requisition)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
 
-  icon_list = EGG_ICON_LIST (widget);
+  icon_view = GTK_ICON_VIEW (widget);
 
-  requisition->width = icon_list->priv->width;
-  requisition->height = icon_list->priv->height;
+  requisition->width = icon_view->priv->width;
+  requisition->height = icon_view->priv->height;
 }
 
 static void
-egg_icon_list_size_allocate (GtkWidget      *widget,
+gtk_icon_view_size_allocate (GtkWidget      *widget,
                             GtkAllocation  *allocation)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
+  GtkAdjustment *hadjustment, *vadjustment;
 
   widget->allocation = *allocation;
   
-  icon_list = EGG_ICON_LIST (widget);
+  icon_view = GTK_ICON_VIEW (widget);
   
   if (GTK_WIDGET_REALIZED (widget))
     {
       gdk_window_move_resize (widget->window,
                              allocation->x, allocation->y,
                              allocation->width, allocation->height);
-      gdk_window_resize (icon_list->priv->bin_window,
-                        MAX (icon_list->priv->width, allocation->width),
-                        MAX (icon_list->priv->height, allocation->height));
+      gdk_window_resize (icon_view->priv->bin_window,
+                        MAX (icon_view->priv->width, allocation->width),
+                        MAX (icon_view->priv->height, allocation->height));
     }
 
-  icon_list->priv->hadjustment->page_size = allocation->width;
-  icon_list->priv->hadjustment->page_increment = allocation->width * 0.9;
-  icon_list->priv->hadjustment->step_increment = allocation->width * 0.1;
-  icon_list->priv->hadjustment->lower = 0;
-  icon_list->priv->hadjustment->upper = MAX (allocation->width, icon_list->priv->width);
-  g_signal_emit_by_name (icon_list->priv->hadjustment, "changed");
+  hadjustment = icon_view->priv->hadjustment;
+  vadjustment = icon_view->priv->vadjustment;
+
+  hadjustment->page_size = allocation->width;
+  hadjustment->page_increment = allocation->width * 0.9;
+  hadjustment->step_increment = allocation->width * 0.1;
+  hadjustment->lower = 0;
+  hadjustment->upper = MAX (allocation->width, icon_view->priv->width);
 
-  icon_list->priv->vadjustment->page_size = allocation->height;
-  icon_list->priv->vadjustment->page_increment = allocation->height * 0.9;
-  icon_list->priv->vadjustment->step_increment = allocation->width * 0.1;
-  icon_list->priv->vadjustment->lower = 0;
-  icon_list->priv->vadjustment->upper = MAX (allocation->height, icon_list->priv->height);
-  g_signal_emit_by_name (icon_list->priv->hadjustment, "changed");
+  if (hadjustment->value > hadjustment->upper - hadjustment->page_size)
+    gtk_adjustment_set_value (hadjustment, MAX (0, hadjustment->upper - hadjustment->page_size));
 
-  egg_icon_list_layout (icon_list);
+  gtk_adjustment_changed (hadjustment);
+
+  vadjustment->page_size = allocation->height;
+  vadjustment->page_increment = allocation->height * 0.9;
+  vadjustment->step_increment = allocation->height * 0.1;
+  vadjustment->lower = 0;
+  vadjustment->upper = MAX (allocation->height, icon_view->priv->height);
+
+  if (vadjustment->value > vadjustment->upper - vadjustment->page_size)
+    gtk_adjustment_set_value (vadjustment, MAX (0, vadjustment->upper - vadjustment->page_size));
+
+  gtk_adjustment_changed (vadjustment);
+
+  gtk_icon_view_layout (icon_view);
 }
 
 static gboolean
-egg_icon_list_expose (GtkWidget *widget,
+gtk_icon_view_expose (GtkWidget *widget,
                      GdkEventExpose *expose)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
   GList *icons;
+  cairo_t *cr;
 
-  icon_list = EGG_ICON_LIST (widget);
+  icon_view = GTK_ICON_VIEW (widget);
 
-  if (expose->window != icon_list->priv->bin_window)
+  if (expose->window != icon_view->priv->bin_window)
     return FALSE;
 
-  for (icons = icon_list->priv->items; icons; icons = icons->next) {
-    EggIconListItem *item = icons->data;
+  cr = gdk_drawable_create_cairo_context (icon_view->priv->bin_window);
+  cairo_set_line_width (cr, 1.);
+
+  for (icons = icon_view->priv->items; icons; icons = icons->next) {
+    GtkIconViewItem *item = icons->data;
     GdkRectangle item_rectangle;
 
     item_rectangle.x = item->x;
@@ -742,10 +1026,26 @@ egg_icon_list_expose (GtkWidget *widget,
     if (gdk_region_rect_in (expose->region, &item_rectangle) == GDK_OVERLAP_RECTANGLE_OUT)
       continue;
 
-    egg_icon_list_paint_item (icon_list, item, &expose->area);
+#ifdef DEBUG_ICON_VIEW
+    cairo_rectangle (cr,
+                    item->x + 0.5, item->y + 0.5,
+                    item->width - 1, item->height - 1);
+    cairo_rectangle (cr, 
+                    item->x + 0.5, item->y + 0.5, 
+                    item->width - 1, item->height- 1);
+    cairo_rectangle (cr,
+                    item->pixbuf_x + 0.5, item->pixbuf_y + 0.5, 
+                    item->pixbuf_width - 1, item->pixbuf_height- 1);
+    cairo_rectangle (cr,
+                    item->layout_x + 0.5, item->layout_y + 0.5, 
+                    item->layout_width - 1, item->layout_height - 1);
+    cairo_stroke (cr);
+#endif
+    gtk_icon_view_paint_item (icon_view, cr, item, &expose->area);
+
   }
 
-  if (icon_list->priv->rubberbanding)
+  if (icon_view->priv->doing_rubberband)
     {
       GdkRectangle *rectangles;
       gint n_rectangles;
@@ -755,41 +1055,96 @@ egg_icon_list_expose (GtkWidget *widget,
                                 &n_rectangles);
       
       while (n_rectangles--)
-       egg_icon_list_paint_rubberband (icon_list, &rectangles[n_rectangles]);
+       gtk_icon_view_paint_rubberband (icon_view, cr, &rectangles[n_rectangles]);
 
       g_free (rectangles);
     }
 
+  cairo_destroy (cr);
+
   return TRUE;
 }
 
 static gboolean
-egg_icon_list_motion (GtkWidget      *widget,
+scroll_timeout (gpointer data)
+{
+  GtkIconView *icon_view;
+  gdouble value;
+
+  GDK_THREADS_ENTER ();
+  
+  icon_view = data;
+
+  value = MIN (icon_view->priv->vadjustment->value +
+              icon_view->priv->scroll_value_diff,
+              icon_view->priv->vadjustment->upper -
+              icon_view->priv->vadjustment->page_size);
+
+  gtk_adjustment_set_value (icon_view->priv->vadjustment,
+                           value);
+
+  gtk_icon_view_update_rubberband (icon_view);
+  
+  GDK_THREADS_LEAVE ();
+
+  return TRUE;
+}
+
+static gboolean
+gtk_icon_view_motion (GtkWidget      *widget,
                      GdkEventMotion *event)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
+  gint abs_y;
+  
+  icon_view = GTK_ICON_VIEW (widget);
+#ifdef DND_WORKS
+  gtk_icon_view_maybe_begin_dragging_items (icon_view, event);
+#endif
+  if (icon_view->priv->doing_rubberband)
+    {
+      gtk_icon_view_update_rubberband (widget);
+      
+      abs_y = event->y - icon_view->priv->height *
+       (icon_view->priv->vadjustment->value /
+        (icon_view->priv->vadjustment->upper -
+         icon_view->priv->vadjustment->lower));
 
-  icon_list = EGG_ICON_LIST (widget);
+      if (abs_y < 0 || abs_y > widget->allocation.height)
+       {
+         if (icon_view->priv->scroll_timeout_id == 0)
+           icon_view->priv->scroll_timeout_id = g_timeout_add (30, scroll_timeout, icon_view);
+
+         if (abs_y < 0)
+           icon_view->priv->scroll_value_diff = abs_y;
+         else
+           icon_view->priv->scroll_value_diff = abs_y - widget->allocation.height;
 
-  egg_icon_list_maybe_begin_dragging_items (icon_list, event);
+         icon_view->priv->event_last_x = event->x;
+         icon_view->priv->event_last_y = event->y;
+       }
+      else if (icon_view->priv->scroll_timeout_id != 0)
+       {
+         g_source_remove (icon_view->priv->scroll_timeout_id);
 
-  if (icon_list->priv->rubberbanding)
-    rubberbanding (widget);
+         icon_view->priv->scroll_timeout_id = 0;
+       }
+    }
   
   return TRUE;
 }
 
 static gboolean
-egg_icon_list_button_press (GtkWidget      *widget,
+gtk_icon_view_button_press (GtkWidget      *widget,
                            GdkEventButton *event)
 {
-  EggIconList *icon_list;
-  EggIconListItem *item;
+  GtkIconView *icon_view;
+  GtkIconViewItem *item;
   gboolean dirty = FALSE;
-  
-  icon_list = EGG_ICON_LIST (widget);
 
-  if (event->window != icon_list->priv->bin_window)
+  icon_view = GTK_ICON_VIEW (widget);
+
+  if (event->window != icon_view->priv->bin_window)
     return FALSE;
 
   if (!GTK_WIDGET_HAS_FOCUS (widget))
@@ -798,400 +1153,276 @@ egg_icon_list_button_press (GtkWidget      *widget,
   if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
     {
 
-      if (icon_list->priv->selection_mode == GTK_SELECTION_NONE)
-       return TRUE;
-      
-      item = egg_icon_list_get_item_at_pos (icon_list,
+      item = gtk_icon_view_get_item_at_pos (icon_view,
                                            event->x, event->y);
-
+      
       if (item != NULL)
        {
-         if (icon_list->priv->selection_mode == GTK_SELECTION_MULTIPLE &&
-             (event->state & GDK_CONTROL_MASK))
+         gtk_icon_view_scroll_to_item (icon_view, item);
+         
+         if (icon_view->priv->selection_mode == GTK_SELECTION_NONE)
+           {
+             gtk_icon_view_set_cursor_item (icon_view, item);
+           }
+         else if (icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE &&
+                  (event->state & GDK_SHIFT_MASK))
            {
-             item->selected = !item->selected;
+             gtk_icon_view_unselect_all_internal (icon_view);
+
+             gtk_icon_view_set_cursor_item (icon_view, item);
+             if (!icon_view->priv->anchor_item)
+               icon_view->priv->anchor_item = item;
+             else 
+               gtk_icon_view_select_all_between (icon_view,
+                                                 icon_view->priv->anchor_item,
+                                                 item);
              dirty = TRUE;
            }
-         else
+         else 
            {
-             if (!item->selected)
+             if ((icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE ||
+                 ((icon_view->priv->selection_mode == GTK_SELECTION_SINGLE) && item->selected)) &&
+                 (event->state & GDK_CONTROL_MASK))
                {
-                 egg_icon_list_unselect_all_internal (icon_list, FALSE);
-             
-                 item->selected = TRUE;
+                 item->selected = !item->selected;
+                 gtk_icon_view_queue_draw_item (icon_view, item);
                  dirty = TRUE;
                }
+             else
+               {
+                 if (!item->selected)
+                   {
+                     gtk_icon_view_unselect_all_internal (icon_view);
+                     
+                     item->selected = TRUE;
+                     gtk_icon_view_queue_draw_item (icon_view, item);
+                     dirty = TRUE;
+                   }
+               }
+             gtk_icon_view_set_cursor_item (icon_view, item);
+             icon_view->priv->anchor_item = item;
            }
-         
-         egg_icon_list_set_cursor_item (icon_list, item);
-         egg_icon_list_queue_draw_item (icon_list, item);
-         
+#ifdef DND_WORKS
          /* Save press to possibly begin a drag */
-         if (icon_list->priv->pressed_button < 0)
+         if (icon_view->priv->pressed_button < 0)
            {
-             icon_list->priv->pressed_button = event->button;
-             icon_list->priv->press_start_x = event->x;
-             icon_list->priv->press_start_y = event->y;
+             icon_view->priv->pressed_button = event->button;
+             icon_view->priv->press_start_x = event->x;
+             icon_view->priv->press_start_y = event->y;
            }
-
-         if (!icon_list->priv->last_single_clicked)
-           icon_list->priv->last_single_clicked = item;
+#endif
+         if (!icon_view->priv->last_single_clicked)
+           icon_view->priv->last_single_clicked = item;
        }
       else
        {
-         if (icon_list->priv->selection_mode != GTK_SELECTION_BROWSE &&
+         if (icon_view->priv->selection_mode != GTK_SELECTION_BROWSE &&
              !(event->state & GDK_CONTROL_MASK))
            {
-             dirty = egg_icon_list_unselect_all_internal (icon_list, FALSE);
+             dirty = gtk_icon_view_unselect_all_internal (icon_view);
            }
          
-         if (icon_list->priv->selection_mode == GTK_SELECTION_MULTIPLE)
-           egg_icon_list_start_rubberbanding (icon_list, event->x, event->y);
+         if (icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE)
+           gtk_icon_view_start_rubberbanding (icon_view, event->x, event->y);
        }
 
     }
 
   if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
     {
-      item = egg_icon_list_get_item_at_pos (icon_list,
+      item = gtk_icon_view_get_item_at_pos (icon_view,
                                            event->x, event->y);
 
-      if (item && item == icon_list->priv->last_single_clicked)
+      if (item && item == icon_view->priv->last_single_clicked)
        {
-         egg_icon_list_item_activated (icon_list, item);
+         GtkTreePath *path;
+
+         path = gtk_tree_path_new_from_indices (item->index, -1);
+         gtk_icon_view_item_activated (icon_view, path);
+         gtk_tree_path_free (path);
        }
 
-      icon_list->priv->last_single_clicked = NULL;
+      icon_view->priv->last_single_clicked = NULL;
     }
   
   if (dirty)
-    g_signal_emit (icon_list, icon_list_signals[SELECTION_CHANGED], 0);
+    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
 
-  return TRUE;
+  return event->button == 1;
 }
 
 static gboolean
-egg_icon_list_button_release (GtkWidget      *widget,
+gtk_icon_view_button_release (GtkWidget      *widget,
                              GdkEventButton *event)
 {
-  EggIconList *icon_list;
-
-  icon_list = EGG_ICON_LIST (widget);
-
-  if (icon_list->priv->pressed_button == event->button)
-    icon_list->priv->pressed_button = -1;
-
-  egg_icon_list_stop_rubberbanding (icon_list);
-
-  return TRUE;
-}
-
-
-static gboolean
-egg_icon_list_key_press (GtkWidget    *widget,
-                        GdkEventKey  *event)
-{
-  if ((* GTK_WIDGET_CLASS (parent_class)->key_press_event) (widget, event))
-    return TRUE;
+  GtkIconView *icon_view;
 
-  return FALSE;
+  icon_view = GTK_ICON_VIEW (widget);
   
-  if ((event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) == 0)
-    egg_icon_list_append_typeahead_string (EGG_ICON_LIST (widget), event->string);
-
-  return TRUE;
-}
-
-static void
-egg_icon_list_select_first_matching_item (EggIconList  *icon_list,
-                                         const char   *pattern)
-{
-  GList *items;
+#ifdef DND_WORKS
+  if (icon_view->priv->pressed_button == event->button)
+    icon_view->priv->pressed_button = -1;
+#endif
+  gtk_icon_view_stop_rubberbanding (icon_view);
 
-  if (pattern == NULL)
-    return;
-  
-  for (items = icon_list->priv->items; items; items = items->next)
+  if (icon_view->priv->scroll_timeout_id != 0)
     {
-      EggIconListItem *item = items->data;
-
-      if (strncmp (pattern, item->label, strlen (pattern)) == 0)
-       {
-         egg_icon_list_select_item (icon_list, item);
-         break;
-       }
+      g_source_remove (icon_view->priv->scroll_timeout_id);
+      icon_view->priv->scroll_timeout_id = 0;
     }
+
+  return TRUE;
 }
 
 static void
-rubberbanding (gpointer data)
+gtk_icon_view_update_rubberband (gpointer data)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
   gint x, y;
   GdkRectangle old_area;
   GdkRectangle new_area;
   GdkRectangle common;
-  GdkRegion *common_region;
   GdkRegion *invalid_region;
   
-  icon_list = EGG_ICON_LIST (data);
+  icon_view = GTK_ICON_VIEW (data);
 
-  gdk_window_get_pointer (icon_list->priv->bin_window, &x, &y, NULL);
+  gdk_window_get_pointer (icon_view->priv->bin_window, &x, &y, NULL);
 
   x = MAX (x, 0);
   y = MAX (y, 0);
 
-  old_area.x = MIN (icon_list->priv->rubberband_x1,
-                   icon_list->priv->rubberband_x2);
-  old_area.y = MIN (icon_list->priv->rubberband_y1,
-                   icon_list->priv->rubberband_y2);
-  old_area.width = ABS (icon_list->priv->rubberband_x2 -
-                       icon_list->priv->rubberband_x1) + 1;
-  old_area.height = ABS (icon_list->priv->rubberband_y2 -
-                        icon_list->priv->rubberband_y1) + 1;
+  old_area.x = MIN (icon_view->priv->rubberband_x1,
+                   icon_view->priv->rubberband_x2);
+  old_area.y = MIN (icon_view->priv->rubberband_y1,
+                   icon_view->priv->rubberband_y2);
+  old_area.width = ABS (icon_view->priv->rubberband_x2 -
+                       icon_view->priv->rubberband_x1) + 1;
+  old_area.height = ABS (icon_view->priv->rubberband_y2 -
+                        icon_view->priv->rubberband_y1) + 1;
   
-  new_area.x = MIN (icon_list->priv->rubberband_x1, x);
-  new_area.y = MIN (icon_list->priv->rubberband_y1, y);
-  new_area.width = ABS (x - icon_list->priv->rubberband_x1) + 1;
-  new_area.height = ABS (y - icon_list->priv->rubberband_y1) + 1;
+  new_area.x = MIN (icon_view->priv->rubberband_x1, x);
+  new_area.y = MIN (icon_view->priv->rubberband_y1, y);
+  new_area.width = ABS (x - icon_view->priv->rubberband_x1) + 1;
+  new_area.height = ABS (y - icon_view->priv->rubberband_y1) + 1;
+
+  invalid_region = gdk_region_rectangle (&old_area);
+  gdk_region_union_with_rect (invalid_region, &new_area);
 
   gdk_rectangle_intersect (&old_area, &new_area, &common);
-  
-  /* always invalidate border */
-  if (common.width > 2)
+  if (common.width > 2 && common.height > 2)
     {
-      common.width -= 2;
+      GdkRegion *common_region;
+
+      /* make sure the border is invalidated */
       common.x += 1;
-    }
-  
-  if (common.height > 2)
-    {
       common.y += 1;
+      common.width -= 2;
       common.height -= 2;
-    }
+      
+      common_region = gdk_region_rectangle (&common);
 
-  common_region = gdk_region_rectangle (&common);
-  
-  invalid_region = gdk_region_rectangle (&old_area);
-  gdk_region_union_with_rect (invalid_region, &new_area);
-  gdk_region_subtract (invalid_region, common_region);
+      gdk_region_subtract (invalid_region, common_region);
+      gdk_region_destroy (common_region);
+    }
   
-  gdk_window_invalidate_region (icon_list->priv->bin_window, invalid_region, TRUE);
+  gdk_window_invalidate_region (icon_view->priv->bin_window, invalid_region, TRUE);
     
-  gdk_region_destroy (common_region);
   gdk_region_destroy (invalid_region);
 
-  icon_list->priv->rubberband_x2 = x;
-  icon_list->priv->rubberband_y2 = y;  
+  icon_view->priv->rubberband_x2 = x;
+  icon_view->priv->rubberband_y2 = y;  
 
-  egg_icon_list_update_rubberband_selection (icon_list);
+  gtk_icon_view_update_rubberband_selection (icon_view);
 }
 
 static void
-egg_icon_list_start_rubberbanding (EggIconList  *icon_list,
+gtk_icon_view_start_rubberbanding (GtkIconView  *icon_view,
                                   gint          x,
                                   gint          y)
 {
   GList *items;
 
-  g_assert (!icon_list->priv->rubberbanding);
+  g_assert (!icon_view->priv->doing_rubberband);
 
-  for (items = icon_list->priv->items; items; items = items->next)
+  for (items = icon_view->priv->items; items; items = items->next)
     {
-      EggIconListItem *item = items->data;
+      GtkIconViewItem *item = items->data;
 
       item->selected_before_rubberbanding = item->selected;
     }
   
-  icon_list->priv->rubberband_x1 = x;
-  icon_list->priv->rubberband_y1 = y;
-  icon_list->priv->rubberband_x2 = x;
-  icon_list->priv->rubberband_y2 = y;
+  icon_view->priv->rubberband_x1 = x;
+  icon_view->priv->rubberband_y1 = y;
+  icon_view->priv->rubberband_x2 = x;
+  icon_view->priv->rubberband_y2 = y;
 
-  icon_list->priv->rubberbanding = TRUE;
+  icon_view->priv->doing_rubberband = TRUE;
 
-  gtk_grab_add (GTK_WIDGET (icon_list));
+  gtk_grab_add (GTK_WIDGET (icon_view));
 }
 
 static void
-egg_icon_list_stop_rubberbanding (EggIconList *icon_list)
+gtk_icon_view_stop_rubberbanding (GtkIconView *icon_view)
 {
-  if (!icon_list->priv->rubberbanding)
+  if (!icon_view->priv->doing_rubberband)
     return;
 
-  icon_list->priv->rubberbanding = FALSE;
+  icon_view->priv->doing_rubberband = FALSE;
 
-  gtk_grab_remove (GTK_WIDGET (icon_list));
+  gtk_grab_remove (GTK_WIDGET (icon_view));
   
-  gtk_widget_queue_draw (GTK_WIDGET (icon_list));
-}
-
-static gint
-egg_icon_list_sort_func (EggIconListItem  *a,
-                        EggIconListItem  *b,
-                        EggIconList      *icon_list)
-{
-  gint result;
-
-  result = (* icon_list->priv->sort_func) (icon_list, a, b,
-                                          icon_list->priv->sort_data);
-
-  if (icon_list->priv->sort_order == GTK_SORT_DESCENDING)
-    result = -result;
-
-  return result;
+  gtk_widget_queue_draw (GTK_WIDGET (icon_view));
 }
 
 static void
-egg_icon_list_insert_item_sorted (EggIconList      *icon_list,
-                                 EggIconListItem  *item)
+gtk_icon_view_update_rubberband_selection (GtkIconView *icon_view)
 {
-  GList *list;
-  GList *tmp_list = icon_list->priv->items;
-  gint cmp;
+  GList *items;
+  gint x, y, width, height;
+  gboolean dirty = FALSE;
   
-  egg_icon_list_validate (icon_list);
-
-  list = g_list_alloc ();
-  item->list = list;
-  item->icon_list = icon_list;
-  list->data = item;
+  x = MIN (icon_view->priv->rubberband_x1,
+          icon_view->priv->rubberband_x2);
+  y = MIN (icon_view->priv->rubberband_y1,
+          icon_view->priv->rubberband_y2);
+  width = ABS (icon_view->priv->rubberband_x1 - 
+              icon_view->priv->rubberband_x2);
+  height = ABS (icon_view->priv->rubberband_y1 - 
+               icon_view->priv->rubberband_y2);
   
-  if (!icon_list->priv->items)
+  for (items = icon_view->priv->items; items; items = items->next)
     {
-      icon_list->priv->items = list;
-      icon_list->priv->last_item = list;
-      icon_list->priv->item_count += 1;
-
-      egg_icon_list_validate (icon_list);
+      GtkIconViewItem *item = items->data;
+      gboolean is_in;
+      gboolean selected;
       
-      return;
-    }
-
-  cmp = egg_icon_list_sort_func (item, tmp_list->data, icon_list);
+      is_in = gtk_icon_view_item_hit_test (item, x, y, width, height);
 
-  while ((tmp_list->next) && (cmp > 0))
-    {
-      tmp_list = tmp_list->next;
-      cmp = egg_icon_list_sort_func (item, tmp_list->data, icon_list);
-    }
-
-  if ((!tmp_list->next) && (cmp > 0))
-    {
-      tmp_list->next = list;
-      list->prev = tmp_list;
-      icon_list->priv->last_item = list;
-      icon_list->priv->item_count += 1;
-      egg_icon_list_validate (icon_list);
-      
-      return;
-    }
+      selected = is_in ^ item->selected_before_rubberbanding;
 
-  if (tmp_list->prev)
-    {
-      tmp_list->prev->next = list;
-      list->prev = tmp_list->prev;
+      if (item->selected != selected)
+       {
+         item->selected = selected;
+         dirty = TRUE;
+         gtk_icon_view_queue_draw_item (icon_view, item);
+       }
     }
-  
-  list->next = tmp_list;
-  tmp_list->prev = list;
-
-  if (tmp_list == icon_list->priv->items)
-    icon_list->priv->items = list;
-  
-  icon_list->priv->item_count += 1;
-  egg_icon_list_validate (icon_list);
 
-  egg_icon_list_queue_layout (icon_list);
+  if (dirty)
+    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
 }
 
-
-static void
-egg_icon_list_sort (EggIconList *icon_list)
+static gboolean
+gtk_icon_view_item_hit_test (GtkIconViewItem  *item,
+                            gint              x,
+                            gint              y,
+                            gint              width,
+                            gint              height)
 {
-  egg_icon_list_validate (icon_list);
-
-  /* FIXME: We can optimize this */
-  icon_list->priv->items = g_list_sort_with_data (icon_list->priv->items,
-                                                 (GCompareDataFunc)egg_icon_list_sort_func,
-                                                 icon_list);
-  icon_list->priv->last_item = g_list_last (icon_list->priv->items);
-  
-  egg_icon_list_validate (icon_list);
-  egg_icon_list_queue_layout (icon_list);
-}
-
-
-static void
-egg_icon_list_validate (EggIconList *icon_list)
-{
-#if 0
-  GList *list;
-
-  g_print ("----\n");
-  for (list = icon_list->priv->items; list; list = list->next)
-    {
-      EggIconListItem *item = list->data;
-
-      g_print ("%s\n", egg_icon_list_item_get_label (item));
-    }
-  g_print ("----\n");
-#endif
-  
-  g_assert (g_list_length (icon_list->priv->items) == icon_list->priv->item_count);
-  g_assert (g_list_last (icon_list->priv->items) == icon_list->priv->last_item);
-  g_assert (g_list_first (icon_list->priv->last_item) == icon_list->priv->items);
-}
-
-static void
-egg_icon_list_update_rubberband_selection (EggIconList *icon_list)
-{
-  GList *items;
-  gint x, y, width, height;
-  gboolean dirty = FALSE;
-  
-  x = MIN (icon_list->priv->rubberband_x1,
-          icon_list->priv->rubberband_x2);
-  y = MIN (icon_list->priv->rubberband_y1,
-          icon_list->priv->rubberband_y2);
-  width = ABS (icon_list->priv->rubberband_x1 - 
-              icon_list->priv->rubberband_x2);
-  height = ABS (icon_list->priv->rubberband_y1 - 
-               icon_list->priv->rubberband_y2);
-  
-  for (items = icon_list->priv->items; items; items = items->next)
-    {
-      EggIconListItem *item = items->data;
-      gboolean is_in;
-      gboolean selected;
-      
-      is_in = egg_icon_list_item_hit_test (item, x, y, width, height);
-
-      selected = is_in ^ item->selected_before_rubberbanding;
-
-      if (item->selected != selected)
-       {
-         item->selected = selected;
-         dirty = TRUE;
-         egg_icon_list_queue_draw_item (icon_list, item);
-       }
-    }
-
-  if (dirty)
-    g_signal_emit (icon_list, icon_list_signals[SELECTION_CHANGED], 0);
-}
-
-static gboolean
-egg_icon_list_item_hit_test (EggIconListItem  *item,
-                            gint              x,
-                            gint              y,
-                            gint              width,
-                            gint              height)
-{
-  /* First try the pixbuf */
-  if (MIN (x + width, item->pixbuf_x + item->pixbuf_width) - MAX (x, item->pixbuf_x) > 0 &&
-      MIN (y + height, item->pixbuf_y + item->pixbuf_height) - MAX (y, item->pixbuf_y) > 0)
-    return TRUE;
+  /* First try the pixbuf */
+  if (MIN (x + width, item->pixbuf_x + item->pixbuf_width) - MAX (x, item->pixbuf_x) > 0 &&
+      MIN (y + height, item->pixbuf_y + item->pixbuf_height) - MAX (y, item->pixbuf_y) > 0)
+    return TRUE;
 
   /* Then try the text */
   if (MIN (x + width, item->layout_x + item->layout_width) - MAX (x, item->layout_x) > 0 &&
@@ -1201,88 +1432,88 @@ egg_icon_list_item_hit_test (EggIconListItem  *item,
   return FALSE;
 }
 
+#ifdef DND_WORKS
 static gboolean
-egg_icon_list_maybe_begin_dragging_items (EggIconList     *icon_list,
+gtk_icon_view_maybe_begin_dragging_items (GtkIconView     *icon_view,
                                          GdkEventMotion  *event)
 {
   gboolean retval = FALSE;
   gint button;
-  if (icon_list->priv->pressed_button < 0)
+  if (icon_view->priv->pressed_button < 0)
     return retval;
 
-  if (!gtk_drag_check_threshold (GTK_WIDGET (icon_list),
-                                icon_list->priv->press_start_x,
-                                icon_list->priv->press_start_y,
+  if (!gtk_drag_check_threshold (GTK_WIDGET (icon_view),
+                                icon_view->priv->press_start_x,
+                                icon_view->priv->press_start_y,
                                 event->x, event->y))
     return retval;
 
-  button = icon_list->priv->pressed_button;
-  icon_list->priv->pressed_button = -1;
+  button = icon_view->priv->pressed_button;
+  icon_view->priv->pressed_button = -1;
   
   {
     static GtkTargetEntry row_targets[] = {
-      { "EGG_ICON_LIST_ITEMS", GTK_TARGET_SAME_APP, 0 }
+      { "GTK_ICON_VIEW_ITEMS", GTK_TARGET_SAME_APP, 0 }
     };
     GtkTargetList *target_list;
     GdkDragContext *context;
-    EggIconListItem *item;
+    GtkIconViewItem *item;
     
     retval = TRUE;
     
     target_list = gtk_target_list_new (row_targets, G_N_ELEMENTS (row_targets));
 
-    context = gtk_drag_begin (GTK_WIDGET (icon_list),
+    context = gtk_drag_begin (GTK_WIDGET (icon_view),
                              target_list, GDK_ACTION_MOVE,
                              button,
                              (GdkEvent *)event);
 
-    item = egg_icon_list_get_item_at_pos (icon_list,
-                                         icon_list->priv->press_start_x,
-                                         icon_list->priv->press_start_y);
+    item = gtk_icon_view_get_item_at_pos (icon_view,
+                                         icon_view->priv->press_start_x,
+                                         icon_view->priv->press_start_y);
     g_assert (item != NULL);
-    gtk_drag_set_icon_pixbuf (context, egg_icon_list_item_get_icon (item),
+    gtk_drag_set_icon_pixbuf (context, gtk_icon_view_get_item_icon (icon_view, item),
                              event->x - item->x,
                              event->y - item->y);
   }
   
   return retval;
 }
-
+#endif
 
 static gboolean
-egg_icon_list_unselect_all_internal (EggIconList  *icon_list,
-                                    gboolean      emit)
+gtk_icon_view_unselect_all_internal (GtkIconView  *icon_view)
 {
   gboolean dirty = FALSE;
   GList *items;
-  
-  for (items = icon_list->priv->items; items; items = items->next)
+
+  if (icon_view->priv->selection_mode == GTK_SELECTION_NONE)
+    return FALSE;
+
+  for (items = icon_view->priv->items; items; items = items->next)
     {
-      EggIconListItem *item = items->data;
+      GtkIconViewItem *item = items->data;
 
       if (item->selected)
        {
          item->selected = FALSE;
          dirty = TRUE;
-         egg_icon_list_queue_draw_item (icon_list, item);
+         gtk_icon_view_queue_draw_item (icon_view, item);
        }
     }
 
-  if (emit && dirty)
-    g_signal_emit (icon_list, icon_list_signals[SELECTION_CHANGED], 0);
-
   return dirty;
 }
 
 
-/* EggIconList signals */
+/* GtkIconView signals */
 static void
-egg_icon_list_set_adjustments (EggIconList   *icon_list,
+gtk_icon_view_set_adjustments (GtkIconView   *icon_view,
                               GtkAdjustment *hadj,
                               GtkAdjustment *vadj)
 {
   gboolean need_adjust = FALSE;
-  
+
   if (hadj)
     g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
   else
@@ -1292,160 +1523,212 @@ egg_icon_list_set_adjustments (EggIconList   *icon_list,
   else
     vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
 
-  if (icon_list->priv->hadjustment && (icon_list->priv->hadjustment != hadj))
+  if (icon_view->priv->hadjustment && (icon_view->priv->hadjustment != hadj))
     {
-      g_signal_handlers_disconnect_matched (icon_list->priv->hadjustment, G_SIGNAL_MATCH_DATA,
-                                          0, 0, NULL, NULL, icon_list);
-      g_object_unref (icon_list->priv->hadjustment);
+      g_signal_handlers_disconnect_matched (icon_view->priv->hadjustment, G_SIGNAL_MATCH_DATA,
+                                          0, 0, NULL, NULL, icon_view);
+      g_object_unref (icon_view->priv->hadjustment);
     }
 
-  if (icon_list->priv->vadjustment && (icon_list->priv->vadjustment != vadj))
+  if (icon_view->priv->vadjustment && (icon_view->priv->vadjustment != vadj))
     {
-      g_signal_handlers_disconnect_matched (icon_list->priv->vadjustment, G_SIGNAL_MATCH_DATA,
-                                           0, 0, NULL, NULL, icon_list);
-      g_object_unref (icon_list->priv->vadjustment);
+      g_signal_handlers_disconnect_matched (icon_view->priv->vadjustment, G_SIGNAL_MATCH_DATA,
+                                           0, 0, NULL, NULL, icon_view);
+      g_object_unref (icon_view->priv->vadjustment);
     }
 
-  if (icon_list->priv->hadjustment != hadj)
+  if (icon_view->priv->hadjustment != hadj)
     {
-      icon_list->priv->hadjustment = hadj;
-      g_object_ref (icon_list->priv->hadjustment);
-      gtk_object_sink (GTK_OBJECT (icon_list->priv->hadjustment));
+      icon_view->priv->hadjustment = hadj;
+      g_object_ref (icon_view->priv->hadjustment);
+      gtk_object_sink (GTK_OBJECT (icon_view->priv->hadjustment));
 
-      g_signal_connect (icon_list->priv->hadjustment, "value_changed",
-                       G_CALLBACK (egg_icon_list_adjustment_changed),
-                       icon_list);
+      g_signal_connect (icon_view->priv->hadjustment, "value_changed",
+                       G_CALLBACK (gtk_icon_view_adjustment_changed),
+                       icon_view);
       need_adjust = TRUE;
     }
 
-  if (icon_list->priv->vadjustment != vadj)
+  if (icon_view->priv->vadjustment != vadj)
     {
-      icon_list->priv->vadjustment = vadj;
-      g_object_ref (icon_list->priv->vadjustment);
-      gtk_object_sink (GTK_OBJECT (icon_list->priv->vadjustment));
+      icon_view->priv->vadjustment = vadj;
+      g_object_ref (icon_view->priv->vadjustment);
+      gtk_object_sink (GTK_OBJECT (icon_view->priv->vadjustment));
 
-      g_signal_connect (icon_list->priv->vadjustment, "value_changed",
-                       G_CALLBACK (egg_icon_list_adjustment_changed),
-                       icon_list);
+      g_signal_connect (icon_view->priv->vadjustment, "value_changed",
+                       G_CALLBACK (gtk_icon_view_adjustment_changed),
+                       icon_view);
       need_adjust = TRUE;
     }
 
   if (need_adjust)
-    egg_icon_list_adjustment_changed (NULL, icon_list);
+    gtk_icon_view_adjustment_changed (NULL, icon_view);
 }
 
 static void
-egg_icon_list_real_select_all (EggIconList *icon_list)
+gtk_icon_view_real_select_all (GtkIconView *icon_view)
 {
-  if (icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE)
-    return;
-
-  egg_icon_list_select_all (icon_list);
+  gtk_icon_view_select_all (icon_view);
 }
 
 static void
-egg_icon_list_real_unselect_all (EggIconList *icon_list)
+gtk_icon_view_real_unselect_all (GtkIconView *icon_view)
 {
-  if (icon_list->priv->selection_mode == GTK_SELECTION_BROWSE)
-    return;
-
-  egg_icon_list_unselect_all (icon_list);
+  gtk_icon_view_unselect_all (icon_view);
 }
 
 static void
-egg_icon_list_real_select_cursor_item (EggIconList *icon_list)
+gtk_icon_view_real_select_cursor_item (GtkIconView *icon_view)
+{
+  gtk_icon_view_unselect_all (icon_view);
+  
+  if (icon_view->priv->cursor_item != NULL)
+    gtk_icon_view_select_item (icon_view, icon_view->priv->cursor_item);
+}
+
+static gboolean
+gtk_icon_view_real_activate_cursor_item (GtkIconView *icon_view)
 {
-  egg_icon_list_unselect_all (icon_list);
+  GtkTreePath *path;
   
-  if (icon_list->priv->cursor_item != NULL)
-    egg_icon_list_select_item (icon_list, icon_list->priv->cursor_item);
+  if (!icon_view->priv->cursor_item)
+    return FALSE;
+
+  path = gtk_tree_path_new_from_indices (icon_view->priv->cursor_item->index, -1);
+  
+  gtk_icon_view_item_activated (icon_view, path);
+
+  gtk_tree_path_free (path);
+
+  return TRUE;
 }
 
 static void
-egg_icon_list_real_toggle_cursor_item (EggIconList *icon_list)
+gtk_icon_view_real_toggle_cursor_item (GtkIconView *icon_view)
 {
-  if (icon_list->priv->selection_mode == GTK_SELECTION_NONE)
+  if (!icon_view->priv->cursor_item)
     return;
 
-  /* FIXME: Use another function here */
-  if (icon_list->priv->cursor_item != NULL)
+  switch (icon_view->priv->selection_mode)
     {
-      if (icon_list->priv->selection_mode == GTK_SELECTION_BROWSE)
-       icon_list->priv->cursor_item->selected = TRUE;
+    case GTK_SELECTION_NONE:
+      break;
+    case GTK_SELECTION_BROWSE:
+      gtk_icon_view_select_item (icon_view, icon_view->priv->cursor_item);
+      break;
+    case GTK_SELECTION_SINGLE:
+      if (icon_view->priv->cursor_item->selected)
+       gtk_icon_view_unselect_item (icon_view, icon_view->priv->cursor_item);
       else
-       icon_list->priv->cursor_item->selected = !icon_list->priv->cursor_item->selected;
+       gtk_icon_view_select_item (icon_view, icon_view->priv->cursor_item);
+      break;
+    case GTK_SELECTION_MULTIPLE:
+      icon_view->priv->cursor_item->selected = !icon_view->priv->cursor_item->selected;
+      g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0); 
       
-      egg_icon_list_queue_draw_item (icon_list, icon_list->priv->cursor_item);
+      gtk_icon_view_queue_draw_item (icon_view, icon_view->priv->cursor_item);
+      break;
     }
 }
 
 /* Internal functions */
 static void
-egg_icon_list_adjustment_changed (GtkAdjustment *adjustment,
-                                 EggIconList   *icon_list)
+gtk_icon_view_adjustment_changed (GtkAdjustment *adjustment,
+                                 GtkIconView   *icon_view)
 {
-  if (GTK_WIDGET_REALIZED (icon_list))
+  if (GTK_WIDGET_REALIZED (icon_view))
     {
-      gdk_window_move (icon_list->priv->bin_window,
-                      - icon_list->priv->hadjustment->value,
-                      - icon_list->priv->vadjustment->value);
-      gdk_window_process_updates (icon_list->priv->bin_window, TRUE);
+      gdk_window_move (icon_view->priv->bin_window,
+                      - icon_view->priv->hadjustment->value,
+                      - icon_view->priv->vadjustment->value);
+
+      if (icon_view->priv->doing_rubberband)
+       gtk_icon_view_update_rubberband (GTK_WIDGET (icon_view));
+
+      gdk_window_process_updates (icon_view->priv->bin_window, TRUE);
     }
 }
 
 static GList *
-egg_icon_list_layout_single_row (EggIconList *icon_list, GList *first_item, gint *y, gint *maximum_width)
+gtk_icon_view_layout_single_row (GtkIconView *icon_view, 
+                                GList       *first_item, 
+                                gint         item_width,
+                                gint         row,
+                                gint        *y, 
+                                gint        *maximum_width)
 {
+  gint focus_width, focus_pad;
   gint x, current_width, max_height, max_pixbuf_height;
   GList *items, *last_item;
-  gint icon_padding;
-  gint left_margin, right_margin;
-  gint maximum_layout_width;
-  
+  gint col;
+  gint colspan;
+  gboolean rtl = gtk_widget_get_direction (GTK_WIDGET (icon_view)) == GTK_TEXT_DIR_RTL;
+
   x = 0;
+  col = 0;
   max_height = 0;
   max_pixbuf_height = 0;
   items = first_item;
   current_width = 0;
 
-  gtk_widget_style_get (GTK_WIDGET (icon_list),
-                       "icon_padding", &icon_padding,
-                       "left_margin", &left_margin,
-                       "right_margin", &right_margin,
+  gtk_widget_style_get (GTK_WIDGET (icon_view),
+                       "focus-line-width", &focus_width,
+                       "focus-padding", &focus_pad,
                        NULL);
-  
-  x += left_margin;
-  current_width += left_margin + right_margin;
+
+  x += icon_view->priv->margin;
+  current_width += 2 * icon_view->priv->margin;
   items = first_item;
 
   while (items)
     {
-      EggIconListItem *item = items->data;
-
-      egg_icon_list_calculate_item_size (icon_list, item);
+      GtkIconViewItem *item = items->data;
 
-      current_width += MAX (item->width, MINIMUM_ICON_ITEM_WIDTH);
-
-      /* Don't add padding to the first or last icon */
-      
-      if (current_width > GTK_WIDGET (icon_list)->allocation.width &&
-         items != first_item)
-       break;
+      gtk_icon_view_calculate_item_size (icon_view, item, item_width);
 
-      maximum_layout_width = MAX (item->pixbuf_width, MINIMUM_ICON_ITEM_WIDTH);
+      colspan = 1 + (item->width - 1) / (item_width + icon_view->priv->column_spacing);
+      current_width += colspan * (item_width + icon_view->priv->column_spacing);
+       
+      if (items != first_item)
+       {
+         if ((icon_view->priv->columns <= 0 && current_width > GTK_WIDGET (icon_view)->allocation.width) ||
+             (icon_view->priv->columns > 0 && col >= icon_view->priv->columns))
+           break;
+       }
 
       item->y = *y;
-      item->x = x;
-      
-      if (item->width < MINIMUM_ICON_ITEM_WIDTH) {
-       item->x += (MINIMUM_ICON_ITEM_WIDTH - item->width) / 2;
-       x += (MINIMUM_ICON_ITEM_WIDTH - item->width);
-      }
+      item->x = rtl ? GTK_WIDGET (icon_view)->allocation.width - MAX (item_width, item->width) - x : x;
+
+      if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+       {
+         if (rtl)
+           {
+             item->layout_x = item->x + ICON_TEXT_PADDING + focus_width + focus_pad;
+             if (icon_view->priv->text_column != -1 ||
+                 icon_view->priv->markup_column != -1)
+               item->pixbuf_x = item->x + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad) + icon_view->priv->spacing + item->layout_width;
+             else
+               item->pixbuf_x = item->x;
+           }
+         else 
+           {
+             item->pixbuf_x = item->x;
+             if (icon_view->priv->pixbuf_column != -1)
+               item->layout_x = item->x + item->pixbuf_width + icon_view->priv->spacing + ICON_TEXT_PADDING + focus_width + focus_pad;
+             else
+               item->layout_x = item->x + ICON_TEXT_PADDING + focus_width + focus_pad;
+           }
+       }
+      else
+       {
+         if (item->width < colspan * item_width + (colspan - 1) * icon_view->priv->column_spacing)
+           item->x += (colspan * item_width + (colspan - 1) * icon_view->priv->column_spacing - item->width) / 2;
 
-      item->pixbuf_x = item->x + (item->width - item->pixbuf_width) / 2;
-      item->layout_x = item->x + (item->width - item->layout_width) / 2;
+         item->pixbuf_x = item->x + (item->width - item->pixbuf_width) / 2;
+         item->layout_x = item->x + (item->width - item->layout_width) / 2;
+       }
 
-      x += item->width;
+      x = current_width - icon_view->priv->margin; 
 
       max_height = MAX (max_height, item->height);
       max_pixbuf_height = MAX (max_pixbuf_height, item->pixbuf_height);
@@ -1453,197 +1736,232 @@ egg_icon_list_layout_single_row (EggIconList *icon_list, GList *first_item, gint
       if (current_width > *maximum_width)
        *maximum_width = current_width;
 
+      item->row = row;
+      item->col = col;
+
+      col += colspan;
       items = items->next;
     }
 
   last_item = items;
 
-  *y += max_height + icon_padding;
+  *y += max_height + icon_view->priv->row_spacing;
 
   /* Now go through the row again and align the icons */
   for (items = first_item; items != last_item; items = items->next)
     {
-      EggIconListItem *item = items->data;
-
-      item->pixbuf_y = item->y + (max_pixbuf_height - item->pixbuf_height);
-      item->layout_y = item->pixbuf_y + item->pixbuf_height + ICON_TEXT_PADDING;
+      GtkIconViewItem *item = items->data;
 
+      if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+       {
+         item->pixbuf_y = item->y;
+         item->layout_y = item->y + ICON_TEXT_PADDING + focus_width + focus_pad;
+       }
+      else 
+       {
+         item->pixbuf_y = item->y + (max_pixbuf_height - item->pixbuf_height);
+         if (icon_view->priv->pixbuf_column != -1)
+           item->layout_y = item->pixbuf_y + item->pixbuf_height + icon_view->priv->spacing + ICON_TEXT_PADDING + focus_width + focus_pad;
+         else
+           item->layout_y = item->y + ICON_TEXT_PADDING + focus_width + focus_pad;
+      }
       /* Update the bounding box */
       item->y = item->pixbuf_y;
 
       /* We may want to readjust the new y coordinate. */
       if (item->y + item->height > *y)
        *y = item->y + item->height;
+
+      if (rtl)
+       item->col = col - 1 - item->col;
     }
   
   return last_item;
 }
 
 static void
-egg_icon_list_set_adjustment_upper (GtkAdjustment *adj,
+gtk_icon_view_set_adjustment_upper (GtkAdjustment *adj,
                                    gdouble        upper)
 {
   if (upper != adj->upper)
     {
-      gdouble min = MAX (0., upper - adj->page_size);
+      gdouble min = MAX (0.0, upper - adj->page_size);
       gboolean value_changed = FALSE;
       
       adj->upper = upper;
-      
+
       if (adj->value > min)
        {
          adj->value = min;
          value_changed = TRUE;
        }
       
-      g_signal_emit_by_name (adj, "changed");
+      gtk_adjustment_changed (adj);
       
       if (value_changed)
-       g_signal_emit_by_name (adj, "value_changed");
+       gtk_adjustment_value_changed (adj);
     }
 }
 
 static void
-egg_icon_list_layout (EggIconList *icon_list)
+gtk_icon_view_layout (GtkIconView *icon_view)
 {
   gint y = 0, maximum_width = 0;
   GList *icons;
   GtkWidget *widget;
-  gint top_margin, bottom_margin;
-  
-  widget = GTK_WIDGET (icon_list);
-  icons = icon_list->priv->items;
+  gint row;
+  gint item_width;
 
-  gtk_widget_style_get (widget,
-                       "top_margin", &top_margin,
-                       "bottom_margin", &bottom_margin,
-                       NULL);
-  y += top_margin;
+  if (!VALID_MODEL_AND_COLUMNS (icon_view))
+    return;
+
+  widget = GTK_WIDGET (icon_view);
+
+  item_width = icon_view->priv->item_width;
+
+  if (item_width < 0)
+    {
+      for (icons = icon_view->priv->items; icons; icons = icons->next)
+       {
+         GtkIconViewItem *item = icons->data;
+         gtk_icon_view_calculate_item_size (icon_view, item, -1);
+         item_width = MAX (item_width, item->width);
+         gtk_icon_view_item_invalidate_size (item);
+       }
+    }
+
+  icons = icon_view->priv->items;
+  y += icon_view->priv->margin;
+  row = 0;
   
   do
     {
-      icons = egg_icon_list_layout_single_row (icon_list, icons, &y, &maximum_width);
+      icons = gtk_icon_view_layout_single_row (icon_view, icons, 
+                                              item_width, row,
+                                              &y, &maximum_width);
+      row++;
     }
   while (icons != NULL);
 
-  if (maximum_width != icon_list->priv->width)
+  if (maximum_width != icon_view->priv->width)
     {
-      icon_list->priv->width = maximum_width;
+      icon_view->priv->width = maximum_width;
     }
-
-  y += bottom_margin;
+  y += icon_view->priv->margin;
   
-  if (y != icon_list->priv->height)
+  if (y != icon_view->priv->height)
     {
-      icon_list->priv->height = y;
+      icon_view->priv->height = y;
     }
 
-  egg_icon_list_set_adjustment_upper (icon_list->priv->hadjustment, icon_list->priv->width);
-  egg_icon_list_set_adjustment_upper (icon_list->priv->vadjustment, icon_list->priv->height);
+  gtk_icon_view_set_adjustment_upper (icon_view->priv->hadjustment, icon_view->priv->width);
+  gtk_icon_view_set_adjustment_upper (icon_view->priv->vadjustment, icon_view->priv->height);
 
-  if (GTK_WIDGET_REALIZED (icon_list))
+  if (GTK_WIDGET_REALIZED (icon_view))
     {
-      gdk_window_resize (icon_list->priv->bin_window,
-                        MAX (icon_list->priv->width, widget->allocation.width),
-                        MAX (icon_list->priv->height, widget->allocation.height));
+      gdk_window_resize (icon_view->priv->bin_window,
+                        MAX (icon_view->priv->width, widget->allocation.width),
+                        MAX (icon_view->priv->height, widget->allocation.height));
     }
 
-  if (icon_list->priv->layout_idle_id != 0)
+  if (icon_view->priv->layout_idle_id != 0)
     {
-      g_source_remove (icon_list->priv->layout_idle_id);
-      icon_list->priv->layout_idle_id = 0;
+      g_source_remove (icon_view->priv->layout_idle_id);
+      icon_view->priv->layout_idle_id = 0;
     }
 
-  gtk_widget_queue_draw (GTK_WIDGET (icon_list));
-}
-
-
-static void
-egg_icon_list_item_init (EggIconListItem *item)
-{
-  item->width = -1;
-  item->height = -1;
+  gtk_widget_queue_draw (GTK_WIDGET (icon_view));
 }
 
+/* Updates the pango layout and calculates the size */
 static void
-egg_icon_list_item_class_init (GObjectClass *klass)
+gtk_icon_view_calculate_item_size (GtkIconView     *icon_view,
+                                  GtkIconViewItem *item,
+                                  gint             item_width)
 {
-  item_parent_class = g_type_class_peek_parent (klass);
-
-  klass->finalize = egg_icon_list_item_finalize;;
-  klass->set_property = egg_icon_list_item_set_property;
-  klass->get_property = egg_icon_list_item_get_property;
-
-  /* Properties */
-  g_object_class_install_property (klass,
-                                  PROP_LABEL,
-                                  g_param_spec_string ("label",
-                                                       _("Icon item label"),
-                                                       _("The label of the icon item"),
-                                                       NULL,
-                                                       G_PARAM_READWRITE));
+  gint focus_width, focus_pad;
+  gint layout_width, layout_height;
+  gint maximum_layout_width;
+  gint spacing, padding;
+  gint colspan;
+  GdkPixbuf *pixbuf;
+  
+  if (item->width != -1 && item->height != -1) 
+    return;
 
-}
+  gtk_widget_style_get (GTK_WIDGET (icon_view),
+                       "focus-line-width", &focus_width,
+                       "focus-padding", &focus_pad,
+                       NULL);
 
-static void
-egg_icon_list_item_set_property (GObject         *object,
-                                guint            prop_id,
-                                const GValue    *value,
-                                GParamSpec      *pspec)
-{
-}
+  spacing = icon_view->priv->spacing;
 
-static void
-egg_icon_list_item_get_property (GObject         *object,
-                                guint            prop_id,
-                                GValue          *value,
-                                GParamSpec      *pspec)
-{
-}
+  if (icon_view->priv->pixbuf_column != -1)
+    {
+      pixbuf = gtk_icon_view_get_item_icon (icon_view, item);
+      item->pixbuf_width = gdk_pixbuf_get_width (pixbuf);
+      item->pixbuf_height = gdk_pixbuf_get_height (pixbuf);
+      g_object_unref (pixbuf);
+    }
+  else
+    {
+      item->pixbuf_width = 0;
+      item->pixbuf_height = 0;
+      spacing = 0;
+    }
+  
+  if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
+      item_width > 0)
+    {
+      colspan = item->pixbuf_width / item_width + 1;
+      maximum_layout_width = MAX (colspan * item_width - item->pixbuf_width - icon_view->priv->spacing - 2 * (ICON_TEXT_PADDING + focus_width + focus_pad), 50);
+    }
+  else
+    maximum_layout_width = MAX (item_width, item->pixbuf_width);
+    
+  if (icon_view->priv->markup_column != -1 ||
+      icon_view->priv->text_column != -1)
+    {
+      gtk_icon_view_update_item_text (icon_view, item);
 
-static void
-egg_icon_list_item_finalize (GObject *object)
-{
-  EggIconListItem *item;
+      pango_layout_set_alignment (icon_view->priv->layout, PANGO_ALIGN_CENTER);
+      pango_layout_set_width (icon_view->priv->layout, maximum_layout_width * PANGO_SCALE);
+      
+      pango_layout_get_pixel_size (icon_view->priv->layout, &layout_width, &layout_height);
+      
+      item->layout_width = layout_width;
+      item->layout_height = layout_height;
+      padding = 2 * (ICON_TEXT_PADDING + focus_width + focus_pad);
+    }
+  else
+    {
+      item->layout_width = 0;
+      item->layout_height = 0;
+      spacing = 0;
+      padding = 0;
+    }
 
-  item = EGG_ICON_LIST_ITEM (object);
-  
-  g_free (item->label);
-  g_object_unref (item->icon);
-  
-  (G_OBJECT_CLASS (parent_class)->finalize) (object);
+  if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      item->width = item->layout_width + padding + spacing + item->pixbuf_width;
+      item->height = MAX (item->layout_height + padding, item->pixbuf_height);
+    }
+  else
+    {
+      item->width = MAX (item->layout_width + padding, item->pixbuf_width);
+      item->height = item->layout_height + padding + spacing + item->pixbuf_height;
+    }
 }
 
-/* Creates or updates the pango layout and calculates the size */
 static void
-egg_icon_list_calculate_item_size (EggIconList *icon_list, EggIconListItem *item)
+gtk_icon_view_invalidate_sizes (GtkIconView *icon_view)
 {
-  int layout_width, layout_height;
-  int maximum_layout_width;
-  
-  if (item->width != -1 && item->width != -1) 
-    return;
-
-  item->pixbuf_width = gdk_pixbuf_get_width (item->icon);
-  item->pixbuf_height = gdk_pixbuf_get_height (item->icon);
-
-  maximum_layout_width = MAX (item->pixbuf_width, MINIMUM_ICON_ITEM_WIDTH);
-
-  pango_layout_set_text (icon_list->priv->layout, item->label, -1);
-
-  pango_layout_set_alignment (icon_list->priv->layout, PANGO_ALIGN_CENTER);
-  pango_layout_set_width (icon_list->priv->layout, maximum_layout_width * PANGO_SCALE);
-  
-  pango_layout_get_pixel_size (icon_list->priv->layout, &layout_width, &layout_height);
-
-  item->width = MAX ((layout_width + 2 * ICON_TEXT_PADDING), item->pixbuf_width);
-  item->height = layout_height + 2 * ICON_TEXT_PADDING + item->pixbuf_height;
-  item->layout_width = layout_width;
-  item->layout_height = layout_height;
+  g_list_foreach (icon_view->priv->items,
+                 (GFunc)gtk_icon_view_item_invalidate_size, NULL);
 }
 
 static void
-egg_icon_list_item_invalidate_size (EggIconListItem *item)
+gtk_icon_view_item_invalidate_size (GtkIconViewItem *item)
 {
   item->width = -1;
   item->height = -1;
@@ -1695,117 +2013,145 @@ create_colorized_pixbuf (GdkPixbuf *src, GdkColor *new_color)
 }
 
 static void
-egg_icon_list_paint_item (EggIconList     *icon_list,
-                         EggIconListItem *item,
+gtk_icon_view_paint_item (GtkIconView     *icon_view,
+                         cairo_t         *cr,
+                         GtkIconViewItem *item,
                          GdkRectangle    *area)
 {
-  GdkPixbuf *pixbuf;
+  gint focus_width, focus_pad;
+  GdkPixbuf *pixbuf, *tmp;
   GtkStateType state;
+  gboolean rtl = gtk_widget_get_direction (GTK_WIDGET (icon_view)) == GTK_TEXT_DIR_RTL;
   
-  if (GTK_WIDGET_HAS_FOCUS (icon_list))
+  if (!VALID_MODEL_AND_COLUMNS (icon_view))
+    return;
+  
+  gtk_widget_style_get (GTK_WIDGET (icon_view),
+                       "focus-line-width", &focus_width,
+                       "focus-padding", &focus_pad,
+                       NULL);
+
+  if (GTK_WIDGET_HAS_FOCUS (icon_view))
     state = GTK_STATE_SELECTED;
   else
     state = GTK_STATE_ACTIVE;
 
-  if (item->selected)
-    pixbuf = create_colorized_pixbuf (item->icon,
-                                     &GTK_WIDGET (icon_list)->style->base[state]);
-  else
-    pixbuf = gdk_pixbuf_ref (item->icon);
-       
-  gdk_pixbuf_render_to_drawable_alpha (pixbuf,
-                                      icon_list->priv->bin_window,
-                                      0, 0,
-                                      item->pixbuf_x,
-                                      item->pixbuf_y,
-                                      item->pixbuf_width,
-                                      item->pixbuf_height,
-                                      GDK_PIXBUF_ALPHA_FULL,
-                                      0,
-                                      GDK_RGB_DITHER_NORMAL,
-                                      item->pixbuf_width,
-                                      item->pixbuf_height);
-  g_object_unref (pixbuf);
+  if (icon_view->priv->pixbuf_column != -1)
+    {
+      tmp = gtk_icon_view_get_item_icon (icon_view, item);
+      if (item->selected)
+       {
+         pixbuf = create_colorized_pixbuf (tmp,
+                                           &GTK_WIDGET (icon_view)->style->base[state]);
+         g_object_unref (tmp);
+       }
+      else
+       pixbuf = tmp;
 
-  if (item->selected)
+      cairo_move_to (cr, item->pixbuf_x, item->pixbuf_y);
+      gdk_pixbuf_set_as_cairo_source (pixbuf, cr);
+      g_object_unref (pixbuf);
+      
+      cairo_rectangle (cr,
+                      item->pixbuf_x, item->pixbuf_y,
+                      item->pixbuf_width, item->pixbuf_height);
+      cairo_fill (cr);
+    }
+
+  if (icon_view->priv->text_column != -1 ||
+      icon_view->priv->markup_column != -1)
     {
-      gdk_draw_rectangle (icon_list->priv->bin_window,
-                         GTK_WIDGET (icon_list)->style->base_gc[state],
-                         TRUE,
-                         item->layout_x - ICON_TEXT_PADDING,
-                         item->layout_y - ICON_TEXT_PADDING,
-                         item->layout_width + 2 * ICON_TEXT_PADDING,
-                         item->layout_height + 2 * ICON_TEXT_PADDING);
-    }
-
-  pango_layout_set_text (icon_list->priv->layout, item->label, -1);
-  gdk_draw_layout (icon_list->priv->bin_window,
-                  GTK_WIDGET (icon_list)->style->text_gc[item->selected ? state : GTK_STATE_NORMAL],
-                  item->layout_x - ((item->width - item->layout_width) / 2) - (MAX (item->pixbuf_width, MINIMUM_ICON_ITEM_WIDTH) - item->width) / 2,
-                  item->layout_y,
-                  icon_list->priv->layout);
-
-  if (GTK_WIDGET_HAS_FOCUS (icon_list) &&
-      item == icon_list->priv->cursor_item)
-    gtk_paint_focus (GTK_WIDGET (icon_list)->style,
-                    icon_list->priv->bin_window,
-                    item->selected ? GTK_STATE_SELECTED : GTK_STATE_NORMAL,
-                    area,
-                    GTK_WIDGET (icon_list),
-                    "iconlist",
-                    item->layout_x - ICON_TEXT_PADDING,
-                    item->layout_y - ICON_TEXT_PADDING,
-                    item->layout_width + 2 * ICON_TEXT_PADDING,
-                    item->layout_height + 2 * ICON_TEXT_PADDING);
-}
-
-static void
-egg_icon_list_paint_rubberband (EggIconList     *icon_list,
+      if (item->selected)
+       {
+         gdk_cairo_set_source_color (cr, &GTK_WIDGET (icon_view)->style->base[state]);
+         cairo_rectangle (cr,
+                          item->layout_x - ICON_TEXT_PADDING,
+                          item->layout_y - ICON_TEXT_PADDING,
+                          item->layout_width + 2 * ICON_TEXT_PADDING,
+                          item->layout_height + 2 * ICON_TEXT_PADDING);
+         cairo_fill (cr);
+       }
+
+      gtk_icon_view_update_item_text (icon_view, item);
+      pango_layout_set_alignment (icon_view->priv->layout, rtl ? PANGO_ALIGN_RIGHT: PANGO_ALIGN_LEFT);
+      pango_layout_set_width (icon_view->priv->layout, item->layout_width * PANGO_SCALE);
+      gtk_paint_layout (GTK_WIDGET (icon_view)->style,
+                       icon_view->priv->bin_window,
+                       item->selected ? state : GTK_STATE_NORMAL,
+                       TRUE, area, GTK_WIDGET (icon_view), "icon_view",
+                       item->layout_x,
+                       item->layout_y,
+                       icon_view->priv->layout);
+
+      if (GTK_WIDGET_HAS_FOCUS (icon_view) &&
+         item == icon_view->priv->cursor_item)
+       gtk_paint_focus (GTK_WIDGET (icon_view)->style,
+                        icon_view->priv->bin_window,
+                        GTK_STATE_NORMAL,
+                        area,
+                        GTK_WIDGET (icon_view),
+                        "icon_view",
+                        item->layout_x - ICON_TEXT_PADDING - focus_width - focus_pad,
+                        item->layout_y - ICON_TEXT_PADDING - focus_width - focus_pad,
+                        item->layout_width + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad),
+                        item->layout_height + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad));
+    }
+}
+
+static void
+gtk_icon_view_paint_rubberband (GtkIconView     *icon_view,
+                               cairo_t         *cr,
                                GdkRectangle    *area)
 {
   GdkRectangle rect;
-  GdkPixbuf *pixbuf;
-  GdkGC *gc;
-  GdkColor color;
   GdkRectangle rubber_rect;
-  
-  rubber_rect.x = MIN (icon_list->priv->rubberband_x1, icon_list->priv->rubberband_x2);
-  rubber_rect.y = MIN (icon_list->priv->rubberband_y1, icon_list->priv->rubberband_y2);
-  rubber_rect.width = ABS (icon_list->priv->rubberband_x1 - icon_list->priv->rubberband_x2) + 1;
-  rubber_rect.height = ABS (icon_list->priv->rubberband_y1 - icon_list->priv->rubberband_y2) + 1;
+  GdkColor *fill_color_gdk;
+  guchar fill_color_alpha;
+
+  rubber_rect.x = MIN (icon_view->priv->rubberband_x1, icon_view->priv->rubberband_x2);
+  rubber_rect.y = MIN (icon_view->priv->rubberband_y1, icon_view->priv->rubberband_y2);
+  rubber_rect.width = ABS (icon_view->priv->rubberband_x1 - icon_view->priv->rubberband_x2) + 1;
+  rubber_rect.height = ABS (icon_view->priv->rubberband_y1 - icon_view->priv->rubberband_y2) + 1;
 
   if (!gdk_rectangle_intersect (&rubber_rect, area, &rect))
     return;
 
-  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, rect.width, rect.height);
-  gdk_pixbuf_fill (pixbuf, 0x9db8d27F);
-
-  gdk_pixbuf_render_to_drawable_alpha (pixbuf,
-                                      icon_list->priv->bin_window,
-                                      0, 0,
-                                      rect.x,rect.y,
-                                      rect.width, rect.height,
-                                      GDK_PIXBUF_ALPHA_FULL,
-                                      0,
-                                      GDK_RGB_DITHER_NONE,
-                                      0, 0);
-  g_object_unref (pixbuf);
-  gc = gdk_gc_new (icon_list->priv->bin_window);
-  color.red = 0x72 * 255;
-  color.green = 0x7d * 255;
-  color.blue = 0x97 * 255;
-  gdk_gc_set_rgb_fg_color (gc, &color);
-  gdk_gc_set_clip_rectangle (gc, &rect);
-  gdk_draw_rectangle (icon_list->priv->bin_window,
-                     gc, FALSE,
-                     rubber_rect.x, rubber_rect.y,
-                     rubber_rect.width - 1, rubber_rect.height - 1);
-  g_object_unref (gc);
-}
-
-static void
-egg_icon_list_queue_draw_item (EggIconList     *icon_list,
-                              EggIconListItem *item)
+  gtk_widget_style_get (GTK_WIDGET (icon_view),
+                        "selection-box-color", &fill_color_gdk,
+                        "selection-box-alpha", &fill_color_alpha,
+                        NULL);
+
+  if (!fill_color_gdk)
+    fill_color_gdk = gdk_color_copy (&GTK_WIDGET (icon_view)->style->base[GTK_STATE_SELECTED]);
+
+  cairo_set_source_rgba (cr,
+                        fill_color_gdk->red / 65535.,
+                        fill_color_gdk->green / 65535.,
+                        fill_color_gdk->blue / 65535.,
+                        fill_color_alpha / 255.);
+
+  cairo_save (cr);
+  cairo_rectangle (cr, rect.x, rect.y, rect.width, rect.height);
+  cairo_clip (cr);
+  cairo_fill (cr);
+
+  /* Draw the border without alpha */
+  cairo_set_source_rgb (cr,
+                       fill_color_gdk->red / 65535.,
+                       fill_color_gdk->green / 65535.,
+                       fill_color_gdk->blue / 65535.);
+  cairo_rectangle (cr, 
+                  rubber_rect.x + 0.5, rubber_rect.y + 0.5,
+                  rubber_rect.width - 1, rubber_rect.height - 1);
+  cairo_stroke (cr);
+  cairo_restore (cr);
+
+  gdk_color_free (fill_color_gdk);
+}
+
+static void
+gtk_icon_view_queue_draw_item (GtkIconView     *icon_view,
+                              GtkIconViewItem *item)
 {
   GdkRectangle rect;
 
@@ -1814,675 +2160,4087 @@ egg_icon_list_queue_draw_item (EggIconList     *icon_list,
   rect.width = item->width;
   rect.height = item->height;
 
-  gdk_window_invalidate_rect (icon_list->priv->bin_window, &rect, TRUE);
+  if (icon_view->priv->bin_window)
+    gdk_window_invalidate_rect (icon_view->priv->bin_window, &rect, TRUE);
 }
 
 static gboolean
 layout_callback (gpointer user_data)
 {
-  EggIconList *icon_list;
+  GtkIconView *icon_view;
 
-  icon_list = EGG_ICON_LIST (user_data);
+  GDK_THREADS_ENTER ();
+
+  icon_view = GTK_ICON_VIEW (user_data);
   
-  icon_list->priv->layout_idle_id = 0;
+  icon_view->priv->layout_idle_id = 0;
 
-  egg_icon_list_layout (icon_list);
+  gtk_icon_view_layout (icon_view);
   
+  GDK_THREADS_LEAVE();
+
   return FALSE;
 }
 
 static void
-egg_icon_list_queue_layout (EggIconList *icon_list)
+gtk_icon_view_queue_layout (GtkIconView *icon_view)
 {
-  if (icon_list->priv->layout_idle_id != 0)
+  if (icon_view->priv->layout_idle_id != 0)
     return;
 
-  icon_list->priv->layout_idle_id = g_idle_add (layout_callback, icon_list);
+  icon_view->priv->layout_idle_id = g_idle_add (layout_callback, icon_view);
 }
 
 static void
-egg_icon_list_set_cursor_item (EggIconList     *icon_list,
-                              EggIconListItem *item)
+gtk_icon_view_set_cursor_item (GtkIconView     *icon_view,
+                              GtkIconViewItem *item)
 {
-  if (icon_list->priv->cursor_item == item)
+  AtkObject *obj;
+  AtkObject *item_obj;
+
+  if (icon_view->priv->cursor_item == item)
     return;
 
-  if (icon_list->priv->cursor_item != NULL)
-    egg_icon_list_queue_draw_item (icon_list, icon_list->priv->cursor_item);
+  if (icon_view->priv->cursor_item != NULL)
+    gtk_icon_view_queue_draw_item (icon_view, icon_view->priv->cursor_item);
   
-  icon_list->priv->cursor_item = item;
-  egg_icon_list_queue_draw_item (icon_list, item);
-}
-
-static void
-egg_icon_list_append_typeahead_string (EggIconList     *icon_list,
-                                      const gchar     *string)
-{
-  int i;
-  char *typeahead_string;
-
-  if (strlen (string) == 0)
-    return;
+  icon_view->priv->cursor_item = item;
+  gtk_icon_view_queue_draw_item (icon_view, item);
+  
+  /* Notify that accessible focus object has changed */
+  obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
+  item_obj = atk_object_ref_accessible_child (obj, item->index);
 
-  for (i = 0; i < strlen (string); i++)
+  if (item_obj != NULL)
     {
-      if (!g_ascii_isprint (string[i]))
-       return;
+      atk_focus_tracker_notify (item_obj);
+      g_object_unref (item_obj); 
     }
-
-  typeahead_string = g_strconcat (icon_list->priv->typeahead_string ?
-                                 icon_list->priv->typeahead_string : "",
-                                 string, NULL);
-  g_free (icon_list->priv->typeahead_string);
-  icon_list->priv->typeahead_string = typeahead_string;
-
-  egg_icon_list_select_first_matching_item (icon_list,
-                                           icon_list->priv->typeahead_string);
-  
-  g_print ("wooo: \"%s\"\n", typeahead_string);
 }
 
-/* Public API */
-GtkWidget *
-egg_icon_list_new (void)
-{
-  EggIconList *icon_list;
-
-  icon_list = g_object_new (EGG_TYPE_ICON_LIST, NULL);
 
-  return GTK_WIDGET (icon_list);
-}
-
-EggIconListItem *
-egg_icon_list_item_new (GdkPixbuf   *icon,
-                       const char  *label)
+static GtkIconViewItem *
+gtk_icon_view_item_new (void)
 {
-  EggIconListItem *item;
+  GtkIconViewItem *item;
 
-  item = g_object_new (EGG_TYPE_ICON_LIST_ITEM, NULL);
-  
-  item->label = g_strdup (label);
-  item->icon = g_object_ref (icon);
+  item = g_new0 (GtkIconViewItem, 1);
+
+  item->width = -1;
+  item->height = -1;
   
   return item;
 }
 
-void
-egg_icon_list_item_set_data (EggIconListItem  *item,
-                            gpointer          data)
-{
-  egg_icon_list_item_set_data_full (item, data, NULL);
-}
-
-void
-egg_icon_list_item_set_data_full (EggIconListItem  *item,
-                                 gpointer          data, 
-                                 GDestroyNotify    destroy_notify)
+static void
+gtk_icon_view_item_free (GtkIconViewItem *item)
 {
-  g_return_if_fail (EGG_IS_ICON_LIST_ITEM (item));
+  g_return_if_fail (item != NULL);
 
-  g_object_set_data_full (G_OBJECT (item), ICON_LIST_ITEM_DATA, data, destroy_notify);
+  g_free (item);
 }
 
-gpointer
-egg_icon_list_item_get_data (EggIconListItem *item)
+static void
+gtk_icon_view_update_item_text (GtkIconView     *icon_view,
+                               GtkIconViewItem *item)
 {
-  g_return_val_if_fail (EGG_IS_ICON_LIST_ITEM (item), NULL);
+  gboolean iters_persist;
+  GtkTreeIter iter;
+  GtkTreePath *path;
+  gchar *text;
+  
+  iters_persist = gtk_tree_model_get_flags (icon_view->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST;
+  
+  if (!iters_persist)
+    {
+      path = gtk_tree_path_new_from_indices (item->index, -1);
+      gtk_tree_model_get_iter (icon_view->priv->model, &iter, path);
+      gtk_tree_path_free (path);
+    }
+  else
+    iter = item->iter;
 
-  return g_object_get_data (G_OBJECT (item), ICON_LIST_ITEM_DATA);
+  if (icon_view->priv->markup_column != -1)
+    {
+      gtk_tree_model_get (icon_view->priv->model, &iter,
+                         icon_view->priv->markup_column, &text,
+                         -1);
+      pango_layout_set_markup (icon_view->priv->layout, text, -1);
+      g_free (text);        
+    }
+  else if (icon_view->priv->text_column != -1)
+    {
+      gtk_tree_model_get (icon_view->priv->model, &iter,
+                         icon_view->priv->text_column, &text,
+                         -1);
+      pango_layout_set_text (icon_view->priv->layout, text, -1);
+      g_free (text);        
+    }
+  else
+      pango_layout_set_text (icon_view->priv->layout, "", -1);
 }
 
-void
-egg_icon_list_item_set_label (EggIconListItem  *item,
-                             const char       *label)
+static GdkPixbuf *
+gtk_icon_view_get_item_icon (GtkIconView      *icon_view,
+                            GtkIconViewItem  *item)
+{
+  gboolean iters_persist;
+  GtkTreeIter iter;
+  GtkTreePath *path;
+  GdkPixbuf *pixbuf;
+  
+  g_return_val_if_fail (item != NULL, NULL);
+
+  iters_persist = gtk_tree_model_get_flags (icon_view->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST;
+  
+  if (!iters_persist)
+    {
+      path = gtk_tree_path_new_from_indices (item->index, -1);
+      gtk_tree_model_get_iter (icon_view->priv->model, &iter, path);
+      gtk_tree_path_free (path);
+    }
+  else
+    iter = item->iter;
+  
+  gtk_tree_model_get (icon_view->priv->model, &iter,
+                     icon_view->priv->pixbuf_column, &pixbuf,
+                     -1);
+
+  return pixbuf;
+}
+
+
+static GtkIconViewItem *
+gtk_icon_view_get_item_at_pos (GtkIconView *icon_view,
+                              gint         x,
+                              gint         y)
+{
+  GList *items;
+  
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      GtkIconViewItem *item = items->data;
+      
+      if (x > item->x && x < item->x + item->width &&
+         y > item->y && y < item->y + item->height)
+       {
+         /* Check if the mouse is inside the icon or the label */
+         if ((x > item->pixbuf_x && x < item->pixbuf_x + item->pixbuf_width &&
+              y > item->pixbuf_y && y < item->pixbuf_y + item->pixbuf_height) ||
+             (x > item->layout_x - ICON_TEXT_PADDING &&
+              x < item->layout_x + item->layout_width + ICON_TEXT_PADDING &&
+              y > item->layout_y - ICON_TEXT_PADDING &&
+              y < item->layout_y + item->layout_height + ICON_TEXT_PADDING))
+           return item;
+       }
+    }
+
+  return NULL;
+}
+
+static void
+gtk_icon_view_select_item (GtkIconView      *icon_view,
+                          GtkIconViewItem  *item)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (item != NULL);
+
+  if (item->selected)
+    return;
+  
+  if (icon_view->priv->selection_mode == GTK_SELECTION_NONE)
+    return;
+  else if (icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    gtk_icon_view_unselect_all_internal (icon_view);
+
+  item->selected = TRUE;
+
+  gtk_icon_view_queue_draw_item (icon_view, item);
+
+  g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+
+static void
+gtk_icon_view_unselect_item (GtkIconView      *icon_view,
+                            GtkIconViewItem  *item)
 {
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
   g_return_if_fail (item != NULL);
-  g_return_if_fail (label != NULL);
 
-  if (strcmp (item->label, label) == 0)
+  if (!item->selected)
+    return;
+  
+  if (icon_view->priv->selection_mode == GTK_SELECTION_NONE ||
+      icon_view->priv->selection_mode == GTK_SELECTION_BROWSE)
+    return;
+  
+  item->selected = FALSE;
+
+  g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
+
+  gtk_icon_view_queue_draw_item (icon_view, item);
+}
+
+static void
+verify_items (GtkIconView *icon_view)
+{
+  GList *items;
+  int i = 0;
+
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      GtkIconViewItem *item = items->data;
+
+      if (item->index != i)
+       g_error ("List item does not match its index: item index %d and list index %d\n", item->index, i);
+
+      i++;
+    }
+}
+
+static void
+gtk_icon_view_row_changed (GtkTreeModel *model,
+                          GtkTreePath  *path,
+                          GtkTreeIter  *iter,
+                          gpointer      data)
+{
+  GtkIconViewItem *item;
+  gint index;
+  GtkIconView *icon_view;
+
+  icon_view = GTK_ICON_VIEW (data);
+  
+  index = gtk_tree_path_get_indices(path)[0];
+  item = g_list_nth (icon_view->priv->items, index)->data;
+
+  gtk_icon_view_item_invalidate_size (item);
+  gtk_icon_view_queue_layout (icon_view);
+
+  verify_items (icon_view);
+}
+
+static void
+gtk_icon_view_row_inserted (GtkTreeModel *model,
+                           GtkTreePath  *path,
+                           GtkTreeIter  *iter,
+                           gpointer      data)
+{
+  gint length, index;
+  GtkIconViewItem *item;
+  gboolean iters_persist;
+  GtkIconView *icon_view;
+  GList *list;
+  
+  icon_view = GTK_ICON_VIEW (data);
+  iters_persist = gtk_tree_model_get_flags (icon_view->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST;
+  
+  length = gtk_tree_model_iter_n_children (model, NULL);
+  index = gtk_tree_path_get_indices(path)[0];
+
+  item = gtk_icon_view_item_new ();
+
+  if (iters_persist)
+    item->iter = *iter;
+
+  item->index = index;
+
+  /* FIXME: We can be more efficient here,
+     we can store a tail pointer and use that when
+     appending (which is a rather common operation)
+  */
+  icon_view->priv->items = g_list_insert (icon_view->priv->items,
+                                        item, index);
+  
+  list = g_list_nth (icon_view->priv->items, index + 1);
+  for (; list; list = list->next)
+    {
+      item = list->data;
+
+      item->index++;
+    }
+    
+  verify_items (icon_view);
+}
+
+static void
+gtk_icon_view_row_deleted (GtkTreeModel *model,
+                          GtkTreePath  *path,
+                          gpointer      data)
+{
+  gint index;
+  GtkIconView *icon_view;
+  GtkIconViewItem *item;
+  GList *list, *next;
+  gboolean emit = FALSE;
+  
+  icon_view = GTK_ICON_VIEW (data);
+
+  index = gtk_tree_path_get_indices(path)[0];
+
+  list = g_list_nth (icon_view->priv->items, index);
+  item = list->data;
+
+  if (item == icon_view->priv->anchor_item)
+    icon_view->priv->anchor_item = NULL;
+
+  if (item == icon_view->priv->cursor_item)
+    icon_view->priv->cursor_item = NULL;
+
+  if (item->selected)
+    emit = TRUE;
+  
+  gtk_icon_view_item_free (item);
+
+  for (next = list->next; next; next = next->next)
+    {
+      item = next->data;
+
+      item->index--;
+    }
+  
+  icon_view->priv->items = g_list_delete_link (icon_view->priv->items, list);
+
+  gtk_icon_view_queue_layout (icon_view);
+
+  verify_items (icon_view);  
+  
+  if (emit)
+    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+static void
+gtk_icon_view_rows_reordered (GtkTreeModel *model,
+                             GtkTreePath  *parent,
+                             GtkTreeIter  *iter,
+                             gint         *new_order,
+                             gpointer      data)
+{
+  int i;
+  int length;
+  GtkIconView *icon_view;
+  GList *items = NULL, *list;
+  GtkIconViewItem **item_array;
+  gint *order;
+  
+  icon_view = GTK_ICON_VIEW (data);
+
+  length = gtk_tree_model_iter_n_children (model, NULL);
+
+  order = g_new (gint, length);
+  for (i = 0; i < length; i++)
+    order [new_order[i]] = i;
+
+  item_array = g_new (GtkIconViewItem *, length);
+  for (i = 0, list = icon_view->priv->items; list != NULL; list = list->next, i++)
+    item_array[order[i]] = list->data;
+  g_free (order);
+
+  for (i = length - 1; i >= 0; i--)
+    {
+      item_array[i]->index = i;
+      items = g_list_prepend (items, item_array[i]);
+    }
+  
+  g_free (item_array);
+  g_list_free (icon_view->priv->items);
+  icon_view->priv->items = items;
+
+  verify_items (icon_view);  
+}
+
+static void
+gtk_icon_view_build_items (GtkIconView *icon_view)
+{
+  GtkTreeIter iter;
+  int i;
+  gboolean iters_persist;
+  GList *items = NULL;
+
+  iters_persist = gtk_tree_model_get_flags (icon_view->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST;
+  
+  if (!gtk_tree_model_get_iter_first (icon_view->priv->model,
+                                     &iter))
+    return;
+
+  i = 0;
+  
+  do
+    {
+      GtkIconViewItem *item = gtk_icon_view_item_new ();
+
+      if (iters_persist)
+       item->iter = iter;
+
+      item->index = i;
+      
+      i++;
+
+      items = g_list_prepend (items, item);
+      
+    } while (gtk_tree_model_iter_next (icon_view->priv->model, &iter));
+
+  icon_view->priv->items = g_list_reverse (items);
+}
+
+static void
+gtk_icon_view_add_move_binding (GtkBindingSet  *binding_set,
+                               guint           keyval,
+                               guint           modmask,
+                               GtkMovementStep step,
+                               gint            count)
+{
+  
+  gtk_binding_entry_add_signal (binding_set, keyval, modmask,
+                                "move_cursor", 2,
+                                G_TYPE_ENUM, step,
+                                G_TYPE_INT, count);
+
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_SHIFT_MASK,
+                                "move_cursor", 2,
+                                G_TYPE_ENUM, step,
+                                G_TYPE_INT, count);
+
+  if ((modmask & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+   return;
+
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+                                "move_cursor", 2,
+                                G_TYPE_ENUM, step,
+                                G_TYPE_INT, count);
+
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK,
+                                "move_cursor", 2,
+                                G_TYPE_ENUM, step,
+                                G_TYPE_INT, count);
+}
+
+static gboolean
+gtk_icon_view_real_move_cursor (GtkIconView     *icon_view,
+                               GtkMovementStep  step,
+                               gint             count)
+{
+  GdkModifierType state;
+
+  g_return_val_if_fail (GTK_ICON_VIEW (icon_view), FALSE);
+  g_return_val_if_fail (step == GTK_MOVEMENT_LOGICAL_POSITIONS ||
+                       step == GTK_MOVEMENT_VISUAL_POSITIONS ||
+                       step == GTK_MOVEMENT_DISPLAY_LINES ||
+                       step == GTK_MOVEMENT_PAGES ||
+                       step == GTK_MOVEMENT_BUFFER_ENDS, FALSE);
+
+  if (!GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (icon_view)))
+    return FALSE;
+
+  gtk_widget_grab_focus (GTK_WIDGET (icon_view));
+
+  if (gtk_get_current_event_state (&state))
+    {
+      if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+        icon_view->priv->ctrl_pressed = TRUE;
+      if ((state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
+        icon_view->priv->shift_pressed = TRUE;
+    }
+  /* else we assume not pressed */
+
+  switch (step)
+    {
+    case GTK_MOVEMENT_LOGICAL_POSITIONS:
+    case GTK_MOVEMENT_VISUAL_POSITIONS:
+      gtk_icon_view_move_cursor_left_right (icon_view, count);
+      break;
+    case GTK_MOVEMENT_DISPLAY_LINES:
+      gtk_icon_view_move_cursor_up_down (icon_view, count);
+      break;
+    case GTK_MOVEMENT_PAGES:
+      gtk_icon_view_move_cursor_page_up_down (icon_view, count);
+      break;
+    case GTK_MOVEMENT_BUFFER_ENDS:
+      gtk_icon_view_move_cursor_start_end (icon_view, count);
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+
+  icon_view->priv->ctrl_pressed = FALSE;
+  icon_view->priv->shift_pressed = FALSE;
+
+  return TRUE;
+}
+
+static GtkIconViewItem *
+find_item (GtkIconView     *icon_view,
+          GtkIconViewItem *current,
+          gint             row_ofs,
+          gint             col_ofs)
+{
+  gint row, col;
+  GList *items;
+  GtkIconViewItem *item;
+
+  /* FIXME: this could be more efficient 
+   */
+  row = current->row + row_ofs;
+  col = current->col + col_ofs;
+
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      item = items->data;
+      if (item->row == row && item->col == col)
+       return item;
+    }
+  
+  return NULL;
+}
+
+
+static GtkIconViewItem *
+find_item_page_up_down (GtkIconView     *icon_view,
+                       GtkIconViewItem *current,
+                       gint             count)
+{
+  GList *item, *next;
+  gint y, col;
+  
+  col = current->col;
+  y = current->y + count * icon_view->priv->vadjustment->page_size;
+
+  item = g_list_find (icon_view->priv->items, current);
+  if (count > 0)
+    {
+      while (item)
+       {
+         for (next = item->next; next; next = next->next)
+           {
+             if (((GtkIconViewItem *)next->data)->col == col)
+               break;
+           }
+         if (!next || ((GtkIconViewItem *)next->data)->y > y)
+           break;
+
+         item = next;
+       }
+    }
+  else 
+    {
+      while (item)
+       {
+         for (next = item->prev; next; next = next->prev)
+           {
+             if (((GtkIconViewItem *)next->data)->col == col)
+               break;
+           }
+         if (!next || ((GtkIconViewItem *)next->data)->y < y)
+           break;
+
+         item = next;
+       }
+    }
+
+  if (item)
+    return item->data;
+
+  return NULL;
+}
+
+static gboolean
+gtk_icon_view_select_all_between (GtkIconView     *icon_view,
+                                 GtkIconViewItem *anchor,
+                                 GtkIconViewItem *cursor)
+{
+  GList *items;
+  GtkIconViewItem *item;
+  gint row1, row2, col1, col2;
+  gboolean dirty = FALSE;
+  
+  if (anchor->row < cursor->row)
+    {
+      row1 = anchor->row;
+      row2 = cursor->row;
+    }
+  else
+    {
+      row1 = cursor->row;
+      row2 = anchor->row;
+    }
+
+  if (anchor->col < cursor->col)
+    {
+      col1 = anchor->col;
+      col2 = cursor->col;
+    }
+  else
+    {
+      col1 = cursor->col;
+      col2 = anchor->col;
+    }
+
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      item = items->data;
+
+      if (row1 <= item->row && item->row <= row2 &&
+         col1 <= item->col && item->col <= col2)
+       {
+         if (!item->selected)
+           dirty = TRUE;
+
+         item->selected = TRUE;
+         
+         gtk_icon_view_queue_draw_item (icon_view, item);
+       }
+    }
+
+  return dirty;
+}
+
+static void 
+gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view,
+                                  gint         count)
+{
+  GtkIconViewItem *item;
+  gboolean dirty = FALSE;
+  
+  if (!GTK_WIDGET_HAS_FOCUS (icon_view))
     return;
+  
+  if (!icon_view->priv->cursor_item)
+    {
+      GList *list;
+
+      if (count > 0)
+       list = icon_view->priv->items;
+      else
+       list = g_list_last (icon_view->priv->items);
+
+      item = list ? list->data : NULL;
+    }
+  else
+    item = find_item (icon_view, 
+                     icon_view->priv->cursor_item,
+                     count, 0);
+
+  if (!item)
+    return;
+
+  if (icon_view->priv->ctrl_pressed ||
+      !icon_view->priv->shift_pressed ||
+      !icon_view->priv->anchor_item ||
+      icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    icon_view->priv->anchor_item = item;
+
+  gtk_icon_view_set_cursor_item (icon_view, item);
+
+  if (!icon_view->priv->ctrl_pressed &&
+      icon_view->priv->selection_mode != GTK_SELECTION_NONE)
+    {
+      gtk_icon_view_unselect_all_internal (icon_view);
+      dirty = gtk_icon_view_select_all_between (icon_view, 
+                                               icon_view->priv->anchor_item,
+                                               item);
+    }
 
-  g_free (item->label);
-  item->label = g_strdup (label);
-  egg_icon_list_item_invalidate_size (item);
+  gtk_icon_view_scroll_to_item (icon_view, item);
 
-  egg_icon_list_queue_layout (item->icon_list);
+  if (dirty)
+    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
+}
 
-  g_object_notify (G_OBJECT (item), "label");
+static void 
+gtk_icon_view_move_cursor_page_up_down (GtkIconView *icon_view,
+                                       gint         count)
+{
+  GtkIconViewItem *item;
+  gboolean dirty = FALSE;
+  
+  if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+    return;
+  
+  if (!icon_view->priv->cursor_item)
+    {
+      GList *list;
+
+      if (count > 0)
+       list = icon_view->priv->items;
+      else
+       list = g_list_last (icon_view->priv->items);
+
+      item = list ? list->data : NULL;
+    }
+  else
+    item = find_item_page_up_down (icon_view, 
+                                  icon_view->priv->cursor_item,
+                                  count);
+
+  if (!item)
+    return;
+
+  if (icon_view->priv->ctrl_pressed ||
+      !icon_view->priv->shift_pressed ||
+      !icon_view->priv->anchor_item ||
+      icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    icon_view->priv->anchor_item = item;
+
+  gtk_icon_view_set_cursor_item (icon_view, item);
+
+  if (!icon_view->priv->ctrl_pressed &&
+      icon_view->priv->selection_mode != GTK_SELECTION_NONE)
+    {
+      gtk_icon_view_unselect_all_internal (icon_view);
+      dirty = gtk_icon_view_select_all_between (icon_view, 
+                                               icon_view->priv->anchor_item,
+                                               item);
+    }
+
+  gtk_icon_view_scroll_to_item (icon_view, item);
+
+  if (dirty)
+    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);  
+}
+
+static void 
+gtk_icon_view_move_cursor_left_right (GtkIconView *icon_view,
+                                     gint         count)
+{
+  GtkIconViewItem *item;
+  gboolean dirty = FALSE;
+  
+  if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+    return;
+  
+  if (!icon_view->priv->cursor_item)
+    {
+      GList *list;
+
+      if (count > 0)
+       list = icon_view->priv->items;
+      else
+       list = g_list_last (icon_view->priv->items);
+
+      item = list ? list->data : NULL;
+    }
+  else
+    item = find_item (icon_view, 
+                     icon_view->priv->cursor_item,
+                     0, count);
+
+  if (!item)
+    return;
+
+  if (icon_view->priv->ctrl_pressed ||
+      !icon_view->priv->shift_pressed ||
+      !icon_view->priv->anchor_item ||
+      icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    icon_view->priv->anchor_item = item;
+
+  gtk_icon_view_set_cursor_item (icon_view, item);
+
+  if (!icon_view->priv->ctrl_pressed &&
+      icon_view->priv->selection_mode != GTK_SELECTION_NONE)
+    {
+      gtk_icon_view_unselect_all_internal (icon_view);
+      dirty = gtk_icon_view_select_all_between (icon_view, 
+                                               icon_view->priv->anchor_item,
+                                               item);
+    }
+
+  gtk_icon_view_scroll_to_item (icon_view, item);
+
+  if (dirty)
+    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+static void 
+gtk_icon_view_move_cursor_start_end (GtkIconView *icon_view,
+                                    gint         count)
+{
+  GtkIconViewItem *item;
+  GList *list;
+  gboolean dirty = FALSE;
+  
+  if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+    return;
+  
+  if (count < 0)
+    list = icon_view->priv->items;
+  else
+    list = g_list_last (icon_view->priv->items);
+  
+  item = list ? list->data : NULL;
+
+  if (!item)
+    return;
+
+  if (icon_view->priv->ctrl_pressed ||
+      !icon_view->priv->shift_pressed ||
+      !icon_view->priv->anchor_item ||
+      icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    icon_view->priv->anchor_item = item;
+
+  gtk_icon_view_set_cursor_item (icon_view, item);
+
+  if (!icon_view->priv->ctrl_pressed &&
+      icon_view->priv->selection_mode != GTK_SELECTION_NONE)
+    {
+      gtk_icon_view_unselect_all (icon_view);
+      dirty = gtk_icon_view_select_all_between (icon_view, 
+                                               icon_view->priv->anchor_item,
+                                               item);
+    }
+
+  gtk_icon_view_scroll_to_item (icon_view, item);
+
+  if (dirty)
+    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+static void     
+gtk_icon_view_scroll_to_item (GtkIconView     *icon_view, 
+                             GtkIconViewItem *item)
+{
+  gint y, height;
+  gdouble value;
+
+  gdk_drawable_get_size (GDK_DRAWABLE (icon_view->priv->bin_window), NULL, &height);
+  gdk_window_get_position (icon_view->priv->bin_window, NULL, &y);
+
+  if (y + item->y < 0)
+    {
+      value = icon_view->priv->vadjustment->value + y + item->y;
+      gtk_adjustment_set_value (icon_view->priv->vadjustment, value);
+    }
+  else if (y + item->y + item->height > GTK_WIDGET (icon_view)->allocation.height)
+    {
+      value = icon_view->priv->vadjustment->value + y + item->y + item->height 
+       - GTK_WIDGET (icon_view)->allocation.height;
+      gtk_adjustment_set_value (icon_view->priv->vadjustment, value);
+    }
+}
+
+/* Public API */
+
+
+/**
+ * gtk_icon_view_new:
+ * 
+ * Creates a new #GtkIconView widget
+ * 
+ * Return value: A newly created #GtkIconView widget
+ *
+ * Since: 2.6
+ **/
+GtkWidget *
+gtk_icon_view_new (void)
+{
+  return g_object_new (GTK_TYPE_ICON_VIEW, NULL);
+}
+
+/**
+ * gtk_icon_view_new_with_model:
+ * @model: The model.
+ * 
+ * Creates a new #GtkIconView widget with the model @model.
+ * 
+ * Return value: A newly created #GtkIconView widget.
+ *
+ * Since: 2.6 
+ **/
+GtkWidget *
+gtk_icon_view_new_with_model (GtkTreeModel *model)
+{
+  return g_object_new (GTK_TYPE_ICON_VIEW, "model", model, NULL);
+}
+
+
+/**
+ * gtk_icon_view_get_path_at_pos:
+ * @icon_view: A #GtkIconView.
+ * @x: The x position to be identified
+ * @y: The y position to be identified
+ * 
+ * Finds the path at the point (@x, @y), relative to widget coordinates.
+ * 
+ * Return value: The #GtkTreePath corresponding to the icon or %NULL
+ * if no icon exists at that position.
+ *
+ * Since: 2.6 
+ **/
+GtkTreePath *
+gtk_icon_view_get_path_at_pos (GtkIconView *icon_view,
+                              gint         x,
+                              gint         y)
+{
+  GtkIconViewItem *item;
+  GtkTreePath *path;
+  
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), NULL);
+
+  item = gtk_icon_view_get_item_at_pos (icon_view, x, y);
+
+  if (!item)
+    return NULL;
+
+  path = gtk_tree_path_new_from_indices (item->index, -1);
+
+  return path;
+}
+
+/**
+ * gtk_icon_view_selected_foreach:
+ * @icon_view: A #GtkIconView.
+ * @func: The funcion to call for each selected icon.
+ * @data: User data to pass to the function.
+ * 
+ * Calls a function for each selected icon. Note that the model or
+ * selection cannot be modified from within this function.
+ *
+ * Since: 2.6 
+ **/
+void
+gtk_icon_view_selected_foreach (GtkIconView           *icon_view,
+                               GtkIconViewForeachFunc func,
+                               gpointer               data)
+{
+  GList *list;
+  
+  for (list = icon_view->priv->items; list; list = list->next)
+    {
+      GtkIconViewItem *item = list->data;
+      GtkTreePath *path = gtk_tree_path_new_from_indices (item->index, -1);
+
+      if (item->selected)
+       (* func) (icon_view, path, data);
+
+      gtk_tree_path_free (path);
+    }
+}
+
+/**
+ * gtk_icon_view_set_selection_mode:
+ * @icon_view: A #GtkIconView.
+ * @mode: The selection mode
+ * 
+ * Sets the selection mode of the @icon_view.
+ *
+ * Since: 2.6 
+ **/
+void
+gtk_icon_view_set_selection_mode (GtkIconView      *icon_view,
+                                 GtkSelectionMode  mode)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+
+  if (mode == icon_view->priv->selection_mode)
+    return;
+  
+  if (mode == GTK_SELECTION_NONE ||
+      icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE)
+    gtk_icon_view_unselect_all (icon_view);
+  
+  icon_view->priv->selection_mode = mode;
+
+  g_object_notify (G_OBJECT (icon_view), "selection-mode");
+}
+
+/**
+ * gtk_icon_view_get_selection_mode:
+ * @icon_view: A #GtkIconView.
+ * 
+ * Gets the selection mode of the @icon_view.
+ *
+ * Return value: the current selection mode
+ *
+ * Since: 2.6 
+ **/
+GtkSelectionMode
+gtk_icon_view_get_selection_mode (GtkIconView *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), GTK_SELECTION_SINGLE);
+
+  return icon_view->priv->selection_mode;
+}
+
+/**
+ * gtk_icon_view_set_model:
+ * @icon_view: A #GtkIconView.
+ * @model: The model.
+ *
+ * Sets the model for a #GtkIconView.  
+ * If the @icon_view already has a model set, it will remove 
+ * it before setting the new model.  If @model is %NULL, then
+ * it will unset the old model.
+ *
+ * Since: 2.6 
+ **/
+void
+gtk_icon_view_set_model (GtkIconView *icon_view,
+                        GtkTreeModel *model)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
+  
+  if (icon_view->priv->model == model)
+    return;
+
+  if (model)
+    {
+      GType column_type;
+      
+      g_return_if_fail (gtk_tree_model_get_flags (model) & GTK_TREE_MODEL_LIST_ONLY);
+
+      if (icon_view->priv->pixbuf_column != -1)
+       {
+         column_type = gtk_tree_model_get_column_type (model,
+                                                       icon_view->priv->pixbuf_column);          
+
+         g_return_if_fail (column_type == GDK_TYPE_PIXBUF);
+       }
+
+      if (icon_view->priv->text_column != -1)
+       {
+         column_type = gtk_tree_model_get_column_type (model,
+                                                       icon_view->priv->text_column);    
+
+         g_return_if_fail (column_type == G_TYPE_STRING);
+       }
+
+      if (icon_view->priv->markup_column != -1)
+       {
+         column_type = gtk_tree_model_get_column_type (model,
+                                                       icon_view->priv->markup_column);          
+
+         g_return_if_fail (column_type == G_TYPE_STRING);
+       }
+      
+    }
+  
+  if (icon_view->priv->model)
+    {
+      g_signal_handlers_disconnect_by_func (icon_view->priv->model,
+                                           gtk_icon_view_row_changed,
+                                           icon_view);
+      g_signal_handlers_disconnect_by_func (icon_view->priv->model,
+                                           gtk_icon_view_row_inserted,
+                                           icon_view);
+      g_signal_handlers_disconnect_by_func (icon_view->priv->model,
+                                           gtk_icon_view_row_deleted,
+                                           icon_view);
+      g_signal_handlers_disconnect_by_func (icon_view->priv->model,
+                                           gtk_icon_view_rows_reordered,
+                                           icon_view);
+
+      g_object_unref (icon_view->priv->model);
+      
+      g_list_foreach (icon_view->priv->items, (GFunc)gtk_icon_view_item_free, NULL);
+      g_list_free (icon_view->priv->items);
+      icon_view->priv->items = NULL;
+      icon_view->priv->anchor_item = NULL;
+      icon_view->priv->cursor_item = NULL;
+      icon_view->priv->last_single_clicked = NULL;
+      icon_view->priv->width = 0;
+      icon_view->priv->height = 0;
+    }
+
+  icon_view->priv->model = model;
+
+  if (icon_view->priv->model)
+    {
+      g_object_ref (icon_view->priv->model);
+      g_signal_connect (icon_view->priv->model,
+                       "row_changed",
+                       G_CALLBACK (gtk_icon_view_row_changed),
+                       icon_view);
+      g_signal_connect (icon_view->priv->model,
+                       "row_inserted",
+                       G_CALLBACK (gtk_icon_view_row_inserted),
+                       icon_view);
+      g_signal_connect (icon_view->priv->model,
+                       "row_deleted",
+                       G_CALLBACK (gtk_icon_view_row_deleted),
+                       icon_view);
+      g_signal_connect (icon_view->priv->model,
+                       "rows_reordered",
+                       G_CALLBACK (gtk_icon_view_rows_reordered),
+                       icon_view);
+
+      gtk_icon_view_build_items (icon_view);
+
+      gtk_icon_view_queue_layout (icon_view);
+    }
+
+  g_object_notify (G_OBJECT (icon_view), "model");  
+
+  if (GTK_WIDGET_REALIZED (icon_view))
+    gtk_widget_queue_resize (GTK_WIDGET (icon_view));
+}
+
+/**
+ * gtk_icon_view_get_model:
+ * @icon_view: a #GtkIconView
+ *
+ * Returns the model the #GtkIconView is based on.  Returns %NULL if the
+ * model is unset.
+ *
+ * Return value: A #GtkTreeModel, or %NULL if none is currently being used.
+ *
+ * Since: 2.6 
+ **/
+GtkTreeModel *
+gtk_icon_view_get_model (GtkIconView *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), NULL);
+
+  return icon_view->priv->model;
+}
+
+/**
+ * gtk_icon_view_set_text_column:
+ * @icon_view: A #GtkIconView.
+ * @column: A column in the currently used model.
+ * 
+ * Sets the column with text for @icon_view to be @column. The text
+ * column must be of type #G_TYPE_STRING.
+ *
+ * Since: 2.6 
+ **/
+void
+gtk_icon_view_set_text_column (GtkIconView *icon_view,
+                              gint          column)
+{
+  if (column == icon_view->priv->text_column)
+    return;
+  
+  if (column == -1)
+    icon_view->priv->text_column = -1;
+  else
+    {
+      if (icon_view->priv->model != NULL)
+       {
+         GType column_type;
+         
+         column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
+
+         g_return_if_fail (column_type == G_TYPE_STRING);
+       }
+      
+      icon_view->priv->text_column = column;
+    }
+
+  gtk_icon_view_invalidate_sizes (icon_view);
+  gtk_icon_view_queue_layout (icon_view);
+  
+  g_object_notify (G_OBJECT (icon_view), "text-column");
+}
+
+/**
+ * gtk_icon_view_get_text_column:
+ * @icon_view: A #GtkIconView.
+ *
+ * Returns the column with text for @icon_view.
+ *
+ * Returns: the text column, or -1 if it's unset.
+ *
+ * Since: 2.6
+ */
+gint
+gtk_icon_view_get_text_column (GtkIconView  *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->text_column;
+}
+
+/**
+ * gtk_icon_view_set_markup_column:
+ * @icon_view: A #GtkIconView.
+ * @column: A column in the currently used model.
+ * 
+ * Sets the column with markup information for @icon_view to be
+ * @column. The markup column must be of type #G_TYPE_STRING.
+ * If the markup column is set to something, it overrides
+ * the text column set by gtk_icon_view_set_text_column().
+ *
+ * Since: 2.6
+ **/
+void
+gtk_icon_view_set_markup_column (GtkIconView *icon_view,
+                                gint         column)
+{
+  if (column == icon_view->priv->markup_column)
+    return;
+  
+  if (column == -1)
+    icon_view->priv->markup_column = -1;
+  else
+    {
+      if (icon_view->priv->model != NULL)
+       {
+         GType column_type;
+         
+         column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
+
+         g_return_if_fail (column_type == G_TYPE_STRING);
+       }
+      
+      icon_view->priv->markup_column = column;
+    }
+
+  gtk_icon_view_invalidate_sizes (icon_view);
+  gtk_icon_view_queue_layout (icon_view);
+  
+  g_object_notify (G_OBJECT (icon_view), "markup-column");
+}
+
+/**
+ * gtk_icon_view_get_markup_column:
+ * @icon_view: A #GtkIconView.
+ *
+ * Returns the column with markup text for @icon_view.
+ *
+ * Returns: the markup column, or -1 if it's unset.
+ *
+ * Since: 2.6
+ */
+gint
+gtk_icon_view_get_markup_column (GtkIconView  *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->markup_column;
+}
+
+/**
+ * gtk_icon_view_set_pixbuf_column:
+ * @icon_view: A #GtkIconView.
+ * @column: A column in the currently used model.
+ * 
+ * Sets the column with pixbufs for @icon_view to be @column. The pixbuf
+ * column must be of type #GDK_TYPE_PIXBUF
+ *
+ * Since: 2.6 
+ **/
+void
+gtk_icon_view_set_pixbuf_column (GtkIconView *icon_view,
+                                gint         column)
+{
+  if (column == icon_view->priv->pixbuf_column)
+    return;
+  
+  if (column == -1)
+    icon_view->priv->pixbuf_column = -1;
+  else
+    {
+      if (icon_view->priv->model != NULL)
+       {
+         GType column_type;
+         
+         column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
+
+         g_return_if_fail (column_type == GDK_TYPE_PIXBUF);
+       }
+      
+      icon_view->priv->pixbuf_column = column;
+    }
+
+  gtk_icon_view_invalidate_sizes (icon_view);
+  gtk_icon_view_queue_layout (icon_view);
+  
+  g_object_notify (G_OBJECT (icon_view), "pixbuf-column");
+  
+}
+
+/**
+ * gtk_icon_view_get_pixbuf_column:
+ * @icon_view: A #GtkIconView.
+ *
+ * Returns the column with pixbufs for @icon_view.
+ *
+ * Returns: the pixbuf column, or -1 if it's unset.
+ *
+ * Since: 2.6
+ */
+gint
+gtk_icon_view_get_pixbuf_column (GtkIconView  *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->pixbuf_column;
+}
+
+/**
+ * gtk_icon_view_select_path:
+ * @icon_view: A #GtkIconView.
+ * @path: The #GtkTreePath to be selected.
+ * 
+ * Selects the row at @path.
+ *
+ * Since: 2.6
+ **/
+void
+gtk_icon_view_select_path (GtkIconView *icon_view,
+                          GtkTreePath *path)
+{
+  GtkIconViewItem *item;
+  
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (icon_view->priv->model != NULL);
+  g_return_if_fail (path != NULL);
+
+  item = g_list_nth (icon_view->priv->items,
+                    gtk_tree_path_get_indices(path)[0])->data;
+
+  if (!item)
+    return;
+  
+  gtk_icon_view_select_item (icon_view, item);
+}
+
+/**
+ * gtk_icon_view_unselect_path:
+ * @icon_view: A #GtkIconView.
+ * @path: The #GtkTreePath to be unselected.
+ * 
+ * Unselects the row at @path.
+ *
+ * Since: 2.6
+ **/
+void
+gtk_icon_view_unselect_path (GtkIconView *icon_view,
+                            GtkTreePath *path)
+{
+  GtkIconViewItem *item;
+  
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (icon_view->priv->model != NULL);
+  g_return_if_fail (path != NULL);
+
+  item = g_list_nth (icon_view->priv->items,
+                    gtk_tree_path_get_indices(path)[0])->data;
+
+  if (!item)
+    return;
+  
+  gtk_icon_view_unselect_item (icon_view, item);
+}
+
+/**
+ * gtk_icon_view_get_selected_items:
+ * @icon_view: A #GtkIconView.
+ *
+ * Creates a list of paths of all selected items. Additionally, if you are
+ * planning on modifying the model after calling this function, you may
+ * want to convert the returned list into a list of #GtkTreeRowReference<!-- -->s.
+ * To do this, you can use gtk_tree_row_reference_new().
+ *
+ * To free the return value, use:
+ * <informalexample><programlisting>
+ * g_list_foreach (list, gtk_tree_path_free, NULL);
+ * g_list_free (list);
+ * </programlisting></informalexample>
+ *
+ * Return value: A #GList containing a #GtkTreePath for each selected row.
+ *
+ * Since: 2.6
+ **/
+GList *
+gtk_icon_view_get_selected_items (GtkIconView *icon_view)
+{
+  GList *list;
+  GList *selected = NULL;
+  
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), NULL);
+  
+  for (list = icon_view->priv->items; list != NULL; list = list->next)
+    {
+      GtkIconViewItem *item = list->data;
+
+      if (item->selected)
+       {
+         GtkTreePath *path = gtk_tree_path_new_from_indices (item->index, -1);
+
+         selected = g_list_prepend (selected, path);
+       }
+    }
+
+  return selected;
+}
+
+/**
+ * gtk_icon_view_select_all:
+ * @icon_view: A #GtkIconView.
+ * 
+ * Selects all the icons. @icon_view must has its selection mode set
+ * to #GTK_SELECTION_MULTIPLE.
+ *
+ * Since: 2.6
+ **/
+void
+gtk_icon_view_select_all (GtkIconView *icon_view)
+{
+  GList *items;
+  gboolean dirty = FALSE;
+  
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+
+  if (icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    return;
+
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      GtkIconViewItem *item = items->data;
+      
+      if (!item->selected)
+       {
+         dirty = TRUE;
+         item->selected = TRUE;
+         gtk_icon_view_queue_draw_item (icon_view, item);
+       }
+    }
+
+  if (dirty)
+    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+/**
+ * gtk_icon_view_unselect_all:
+ * @icon_view: A #GtkIconView.
+ * 
+ * Unselects all the icons.
+ *
+ * Since: 2.6
+ **/
+void
+gtk_icon_view_unselect_all (GtkIconView *icon_view)
+{
+  gboolean dirty = FALSE;
+  
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+
+  if (icon_view->priv->selection_mode == GTK_SELECTION_BROWSE)
+    return;
+
+  dirty = gtk_icon_view_unselect_all_internal (icon_view);
+
+  if (dirty)
+    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+/**
+ * gtk_icon_view_path_is_selected:
+ * @icon_view: A #GtkIconView.
+ * @path: A #GtkTreePath to check selection on.
+ * 
+ * Returns %TRUE if the icon pointed to by @path is currently
+ * selected. If @icon does not point to a valid location, %FALSE is returned.
+ * 
+ * Return value: %TRUE if @path is selected.
+ *
+ * Since: 2.6
+ **/
+gboolean
+gtk_icon_view_path_is_selected (GtkIconView *icon_view,
+                               GtkTreePath *path)
+{
+  GtkIconViewItem *item;
+  
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), FALSE);
+  g_return_val_if_fail (icon_view->priv->model != NULL, FALSE);
+  g_return_val_if_fail (path != NULL, FALSE);
+  
+  item = g_list_nth (icon_view->priv->items,
+                    gtk_tree_path_get_indices(path)[0])->data;
+
+  if (!item)
+    return FALSE;
+  
+  return item->selected;
+}
+
+/**
+ * gtk_icon_view_item_activated:
+ * @icon_view: A #GtkIconView
+ * @path: The #GtkTreePath to be activated
+ * 
+ * Activates the item determined by @path.
+ *
+ * Since: 2.6
+ **/
+void
+gtk_icon_view_item_activated (GtkIconView      *icon_view,
+                             GtkTreePath      *path)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (path != NULL);
+  
+  g_signal_emit (icon_view, icon_view_signals[ITEM_ACTIVATED], 0, path);
+}
+
+/**
+ * gtk_icon_view_set_orientation:
+ * @icon_view: a #GtkIconView
+ * @orientation: the relative position of texts and icons 
+ * 
+ * Sets the ::orientation property which determines whether the labels 
+ * are drawn beside the icons instead of below.
+ *
+ * Since: 2.6
+ **/
+void 
+gtk_icon_view_set_orientation (GtkIconView    *icon_view,
+                              GtkOrientation  orientation)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+
+  if (icon_view->priv->orientation != orientation)
+    {
+      icon_view->priv->orientation = orientation;
+
+      gtk_icon_view_invalidate_sizes (icon_view);
+      gtk_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "orientation");
+    }
+}
+
+/**
+ * gtk_icon_view_get_orientation:
+ * @icon_view: a #GtkIconView
+ * 
+ * Returns the value of the ::orientation property which determines 
+ * whether the labels are drawn beside the icons instead of below. 
+ * 
+ * Return value: the relative position of texts and icons 
+ *
+ * Since: 2.6
+ **/
+GtkOrientation
+gtk_icon_view_get_orientation (GtkIconView *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), 
+                       GTK_ORIENTATION_VERTICAL);
+
+  return icon_view->priv->orientation;
+}
+
+/**
+ * gtk_icon_view_set_columns:
+ * @icon_view: a #GtkIconView
+ * @columns: the number of columns
+ * 
+ * Sets the ::columns property which determines in how
+ * many columns the icons are arranged. If @columns is
+ * -1, the number of columns will be chosen automatically 
+ * to fill the available area. 
+ *
+ * Since: 2.6
+ */
+void 
+gtk_icon_view_set_columns (GtkIconView *icon_view,
+                          gint         columns)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->columns != columns)
+    {
+      icon_view->priv->columns = columns;
+
+      gtk_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "columns");
+    }  
+}
+
+/**
+ * gtk_icon_view_get_columns:
+ * @icon_view: a #GtkIconView
+ * 
+ * Returns the value of the ::columns property.
+ * 
+ * Return value: the number of columns, or -1
+ *
+ * Since: 2.6
+ */
+gint
+gtk_icon_view_get_columns (GtkIconView *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->columns;
+}
+
+/**
+ * gtk_icon_view_set_item_width:
+ * @icon_view: a #GtkIconView
+ * @item_width: the width for each item
+ * 
+ * Sets the ::item-width property which specifies the width 
+ * to use for each item. If it is set to -1, the icon view will 
+ * automatically determine a suitable item size.
+ *
+ * Since: 2.6
+ */
+void 
+gtk_icon_view_set_item_width (GtkIconView *icon_view,
+                             gint         item_width)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->item_width != item_width)
+    {
+      icon_view->priv->item_width = item_width;
+
+      gtk_icon_view_invalidate_sizes (icon_view);
+      gtk_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "item-width");
+    }  
+}
+
+/**
+ * gtk_icon_view_get_item_width:
+ * @icon_view: a #GtkIconView
+ * 
+ * Returns the value of the ::item-width property.
+ * 
+ * Return value: the width of a single item, or -1
+ *
+ * Since: 2.6
+ */
+gint
+gtk_icon_view_get_item_width (GtkIconView *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->item_width;
+}
+
+
+/**
+ * gtk_icon_view_set_spacing:
+ * @icon_view: a #GtkIconView
+ * @spacing: the spacing
+ * 
+ * Sets the ::spacing property which specifies the space 
+ * which is inserted between the cells (i.e. the icon and 
+ * the text) of an item.
+ *
+ * Since: 2.6
+ */
+void 
+gtk_icon_view_set_spacing (GtkIconView *icon_view,
+                          gint         spacing)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->spacing != spacing)
+    {
+      icon_view->priv->spacing = spacing;
+
+      gtk_icon_view_invalidate_sizes (icon_view);
+      gtk_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "spacing");
+    }  
+}
+
+/**
+ * gtk_icon_view_get_spacing:
+ * @icon_view: a #GtkIconView
+ * 
+ * Returns the value of the ::spacing property.
+ * 
+ * Return value: the space between cells 
+ *
+ * Since: 2.6
+ */
+gint
+gtk_icon_view_get_spacing (GtkIconView *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->spacing;
+}
+
+/**
+ * gtk_icon_view_set_row_spacing:
+ * @icon_view: a #GtkIconView
+ * @row_spacing: the row spacing
+ * 
+ * Sets the ::row-spacing property which specifies the space 
+ * which is inserted between the rows of the icon view.
+ *
+ * Since: 2.6
+ */
+void 
+gtk_icon_view_set_row_spacing (GtkIconView *icon_view,
+                              gint         row_spacing)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->row_spacing != row_spacing)
+    {
+      icon_view->priv->row_spacing = row_spacing;
+
+      gtk_icon_view_invalidate_sizes (icon_view);
+      gtk_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "row-spacing");
+    }  
+}
+
+/**
+ * gtk_icon_view_get_row_spacing:
+ * @icon_view: a #GtkIconView
+ * 
+ * Returns the value of the ::row-spacing property.
+ * 
+ * Return value: the space between rows
+ *
+ * Since: 2.6
+ */
+gint
+gtk_icon_view_get_row_spacing (GtkIconView *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->row_spacing;
+}
+
+/**
+ * gtk_icon_view_set_column_spacing:
+ * @icon_view: a #GtkIconView
+ * @column_spacing: the column spacing
+ * 
+ * Sets the ::column-spacing property which specifies the space 
+ * which is inserted between the columns of the icon view.
+ *
+ * Since: 2.6
+ */
+void 
+gtk_icon_view_set_column_spacing (GtkIconView *icon_view,
+                                 gint         column_spacing)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->column_spacing != column_spacing)
+    {
+      icon_view->priv->column_spacing = column_spacing;
+
+      gtk_icon_view_invalidate_sizes (icon_view);
+      gtk_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "column-spacing");
+    }  
+}
+
+/**
+ * gtk_icon_view_get_column_spacing:
+ * @icon_view: a #GtkIconView
+ * 
+ * Returns the value of the ::column-spacing property.
+ * 
+ * Return value: the space between columns
+ *
+ * Since: 2.6
+ */
+gint
+gtk_icon_view_get_column_spacing (GtkIconView *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->column_spacing;
+}
+
+/**
+ * gtk_icon_view_set_marging:
+ * @icon_view: a #GtkIconView
+ * @spacing: the margin
+ * 
+ * Sets the ::margin property which specifies the space 
+ * which is inserted at the top, bottom, left and right 
+ * of the icon view.
+ *
+ * Since: 2.6
+ */
+void 
+gtk_icon_view_set_margin (GtkIconView *icon_view,
+                         gint         margin)
+{
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->margin != margin)
+    {
+      icon_view->priv->margin = margin;
+
+      gtk_icon_view_invalidate_sizes (icon_view);
+      gtk_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "margin");
+    }  
+}
+
+/**
+ * gtk_icon_view_get_margin:
+ * @icon_view: a #GtkIconView
+ * 
+ * Returns the value of the ::margin property.
+ * 
+ * Return value: the space at the borders 
+ *
+ * Since: 2.6
+ */
+gint
+gtk_icon_view_get_margin (GtkIconView *icon_view)
+{
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->margin;
+}
+
+
+/* Accessibility Support */
+
+static gpointer accessible_parent_class;
+static gpointer accessible_item_parent_class;
+static GQuark accessible_private_data_quark = 0;
+
+#define GTK_TYPE_ICON_VIEW_ITEM_ACCESSIBLE      (gtk_icon_view_item_accessible_get_type ())
+#define GTK_ICON_VIEW_ITEM_ACCESSIBLE(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ICON_VIEW_ITEM_ACCESSIBLE, GtkIconViewItemAccessible))
+#define GTK_IS_ICON_VIEW_ITEM_ACCESSIBLE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ICON_VIEW_ITEM_ACCESSIBLE))
+
+static GType gtk_icon_view_item_accessible_get_type (void);
+
+enum {
+    ACTION_ACTIVATE,
+    LAST_ACTION
+};
+
+typedef struct
+{
+  AtkObject parent;
+
+  GtkIconViewItem *item;
+
+  GtkWidget *widget;
+
+  AtkStateSet *state_set;
+
+  gchar *text;
+
+  GtkTextBuffer *text_buffer;
+
+  gchar *action_descriptions[LAST_ACTION];
+  gchar *image_description;
+  guint action_idle_handler;
+} GtkIconViewItemAccessible;
+
+static const gchar *const gtk_icon_view_item_accessible_action_names[] = 
+{
+  "activate",
+  NULL
+};
+
+static const gchar *const gtk_icon_view_item_accessible_action_descriptions[] =
+{
+  "Activate item",
+  NULL
+};
+typedef struct _GtkIconViewItemAccessibleClass
+{
+  AtkObjectClass parent_class;
+
+} GtkIconViewItemAccessibleClass;
+
+static gboolean gtk_icon_view_item_accessible_is_showing (GtkIconViewItemAccessible *item);
+
+static gboolean
+gtk_icon_view_item_accessible_idle_do_action (gpointer data)
+{
+  GtkIconViewItemAccessible *item;
+  GtkIconView *icon_view;
+  GtkTreePath *path;
+
+  GDK_THREADS_ENTER ();
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (data);
+  item->action_idle_handler = 0;
+
+  if (item->widget != NULL)
+    {
+      icon_view = GTK_ICON_VIEW (item->widget);
+      path = gtk_tree_path_new_from_indices (item->item->index, -1);
+      gtk_icon_view_item_activated (icon_view, path);
+      gtk_tree_path_free (path);
+    }
+
+  GDK_THREADS_LEAVE ();
+
+  return FALSE;
+}
+
+static gboolean
+gtk_icon_view_item_accessible_action_do_action (AtkAction *action,
+                                                gint       i)
+{
+  GtkIconViewItemAccessible *item;
+  GtkIconView *icon_view;
+
+  if (i < 0 || i >= LAST_ACTION) 
+    return FALSE;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (action);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return FALSE;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return FALSE;
+
+  icon_view = GTK_ICON_VIEW (item->widget);
+
+  switch (i)
+    {
+    case ACTION_ACTIVATE:
+      if (!item->action_idle_handler)
+        item->action_idle_handler = g_idle_add (gtk_icon_view_item_accessible_idle_do_action, item);
+      break;
+    default:
+      g_assert_not_reached ();
+      return FALSE;
+
+    }        
+  return TRUE;
+}
+
+static gint
+gtk_icon_view_item_accessible_action_get_n_actions (AtkAction *action)
+{
+        return LAST_ACTION;
+}
+
+static const gchar *
+gtk_icon_view_item_accessible_action_get_description (AtkAction *action,
+                                                      gint       i)
+{
+  GtkIconViewItemAccessible *item;
+
+  if (i < 0 || i >= LAST_ACTION) 
+    return NULL;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (action);
+
+  if (item->action_descriptions[i])
+    return item->action_descriptions[i];
+  else
+    return gtk_icon_view_item_accessible_action_descriptions[i];
+}
+
+static const gchar *
+gtk_icon_view_item_accessible_action_get_name (AtkAction *action,
+                                               gint       i)
+{
+  if (i < 0 || i >= LAST_ACTION) 
+    return NULL;
+
+  return gtk_icon_view_item_accessible_action_names[i];
+}
+
+static gboolean
+gtk_icon_view_item_accessible_action_set_description (AtkAction   *action,
+                                                      gint         i,
+                                                      const gchar *description)
+{
+  GtkIconViewItemAccessible *item;
+
+  if (i < 0 || i >= LAST_ACTION) 
+    return FALSE;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (action);
+
+  if (item->action_descriptions[i])
+    g_free (item->action_descriptions[i]);
+
+  item->action_descriptions[i] = g_strdup (description);
+
+  return TRUE;
+}
+
+static void
+atk_action_item_interface_init (AtkActionIface *iface)
+{
+  iface->do_action = gtk_icon_view_item_accessible_action_do_action;
+  iface->get_n_actions = gtk_icon_view_item_accessible_action_get_n_actions;
+  iface->get_description = gtk_icon_view_item_accessible_action_get_description;
+  iface->get_name = gtk_icon_view_item_accessible_action_get_name;
+  iface->set_description = gtk_icon_view_item_accessible_action_set_description;
+}
+
+static const gchar *
+gtk_icon_view_item_accessible_image_get_image_description (AtkImage *image)
+{
+  GtkIconViewItemAccessible *item;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (image);
+
+  return item->image_description;
+}
+
+static gboolean
+gtk_icon_view_item_accessible_image_set_image_description (AtkImage    *image,
+                                                           const gchar *description)
+{
+  GtkIconViewItemAccessible *item;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (image);
+
+  g_free (item->image_description);
+  item->image_description = g_strdup (item->image_description);
+
+  return TRUE;
+}
+
+static void
+gtk_icon_view_item_accessible_image_get_image_size (AtkImage *image,
+                                                    gint     *width,
+                                                    gint     *height)
+{
+  GtkIconViewItemAccessible *item;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (image);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return;
+
+  *width = item->item->pixbuf_width;  
+  *height = item->item->pixbuf_height;  
+}
+
+static void
+gtk_icon_view_item_accessible_image_get_image_position (AtkImage    *image,
+                                                        gint        *x,
+                                                        gint        *y,
+                                                        AtkCoordType coord_type)
+{
+  GtkIconViewItemAccessible *item;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (image);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return;
+
+  atk_component_get_position (ATK_COMPONENT (image), x, y, coord_type);
+  *x+= item->item->pixbuf_x - item->item->x;
+  *y+= item->item->pixbuf_y - item->item->y;
+}
+
+static void
+atk_image_item_interface_init (AtkImageIface *iface)
+{
+  iface->get_image_description = gtk_icon_view_item_accessible_image_get_image_description;
+  iface->set_image_description = gtk_icon_view_item_accessible_image_set_image_description;
+  iface->get_image_size = gtk_icon_view_item_accessible_image_get_image_size;
+  iface->get_image_position = gtk_icon_view_item_accessible_image_get_image_position;
+}
+
+static gchar *
+gtk_icon_view_item_accessible_text_get_text (AtkText *text,
+                                             gint     start_pos,
+                                             gint     end_pos)
+{
+  GtkIconViewItemAccessible *item;
+  GtkTextIter start, end;
+  GtkTextBuffer *buffer;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return NULL;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return NULL;
+
+  buffer = item->text_buffer;
+  gtk_text_buffer_get_iter_at_offset (buffer, &start, start_pos);
+  if (end_pos < 0)
+    gtk_text_buffer_get_end_iter (buffer, &end);
+  else
+    gtk_text_buffer_get_iter_at_offset (buffer, &end, end_pos);
+
+  return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+}
+
+static gunichar
+gtk_icon_view_item_accessible_text_get_character_at_offset (AtkText *text,
+                                                            gint     offset)
+{
+  GtkIconViewItemAccessible *item;
+  GtkTextIter start, end;
+  GtkTextBuffer *buffer;
+  gchar *string;
+  gunichar unichar;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return '\0';
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return '\0';
+
+  buffer = item->text_buffer;
+  if (offset >= gtk_text_buffer_get_char_count (buffer))
+    return '\0';
+
+  gtk_text_buffer_get_iter_at_offset (buffer, &start, offset);
+  end = start;
+  gtk_text_iter_forward_char (&end);
+  string = gtk_text_buffer_get_slice (buffer, &start, &end, FALSE);
+  unichar = g_utf8_get_char (string);
+  g_free(string);
+
+  return unichar;
+}
+
+static void
+get_pango_text_offsets (PangoLayout     *layout,
+                        GtkTextBuffer   *buffer,
+                        gint             function,
+                        AtkTextBoundary  boundary_type,
+                        gint             offset,
+                        gint            *start_offset,
+                        gint            *end_offset,
+                        GtkTextIter     *start_iter,
+                        GtkTextIter     *end_iter)
+{
+  PangoLayoutIter *iter;
+  PangoLayoutLine *line, *prev_line = NULL, *prev_prev_line = NULL;
+  gint index, start_index, end_index;
+  const gchar *text;
+  gboolean found = FALSE;
+
+  text = pango_layout_get_text (layout);
+  index = g_utf8_offset_to_pointer (text, offset) - text;
+  iter = pango_layout_get_iter (layout);
+  do
+    {
+      line = pango_layout_iter_get_line (iter);
+      start_index = line->start_index;
+      end_index = start_index + line->length;
+
+      if (index >= start_index && index <= end_index)
+        {
+          /*
+           * Found line for offset
+           */
+          switch (function)
+            {
+            case 0:
+                  /*
+                   * We want the previous line
+                   */
+              if (prev_line)
+                {
+                  switch (boundary_type)
+                    {
+                    case ATK_TEXT_BOUNDARY_LINE_START:
+                      end_index = start_index;
+                      start_index = prev_line->start_index;
+                      break;
+                    case ATK_TEXT_BOUNDARY_LINE_END:
+                      if (prev_prev_line)
+                        start_index = prev_prev_line->start_index + 
+                                  prev_prev_line->length;
+                      end_index = prev_line->start_index + prev_line->length;
+                      break;
+                    default:
+                      g_assert_not_reached();
+                    }
+                }
+              else
+                start_index = end_index = 0;
+              break;
+            case 1:
+              switch (boundary_type)
+                {
+                case ATK_TEXT_BOUNDARY_LINE_START:
+                  if (pango_layout_iter_next_line (iter))
+                    end_index = pango_layout_iter_get_line (iter)->start_index;
+                  break;
+                case ATK_TEXT_BOUNDARY_LINE_END:
+                  if (prev_line)
+                    start_index = prev_line->start_index + 
+                                  prev_line->length;
+                  break;
+                default:
+                  g_assert_not_reached();
+                }
+              break;
+            case 2:
+               /*
+                * We want the next line
+                */
+              if (pango_layout_iter_next_line (iter))
+                {
+                  line = pango_layout_iter_get_line (iter);
+                  switch (boundary_type)
+                    {
+                    case ATK_TEXT_BOUNDARY_LINE_START:
+                      start_index = line->start_index;
+                      if (pango_layout_iter_next_line (iter))
+                        end_index = pango_layout_iter_get_line (iter)->start_index;
+                      else
+                        end_index = start_index + line->length;
+                      break;
+                    case ATK_TEXT_BOUNDARY_LINE_END:
+                      start_index = end_index;
+                      end_index = line->start_index + line->length;
+                      break;
+                    default:
+                      g_assert_not_reached();
+                    }
+                }
+              else
+                start_index = end_index;
+              break;
+            }
+          found = TRUE;
+          break;
+        }
+      prev_prev_line = prev_line; 
+      prev_line = line; 
+    }
+  while (pango_layout_iter_next_line (iter));
+
+  if (!found)
+    {
+      start_index = prev_line->start_index + prev_line->length;
+      end_index = start_index;
+    }
+  pango_layout_iter_free (iter);
+  *start_offset = g_utf8_pointer_to_offset (text, text + start_index);
+  *end_offset = g_utf8_pointer_to_offset (text, text + end_index);
+  gtk_text_buffer_get_iter_at_offset (buffer, start_iter, *start_offset);
+  gtk_text_buffer_get_iter_at_offset (buffer, end_iter, *end_offset);
+}
+
+static gchar*
+gtk_icon_view_item_accessible_text_get_text_before_offset (AtkText         *text,
+                                                           gint            offset,
+                                                           AtkTextBoundary boundary_type,
+                                                           gint            *start_offset,
+                                                           gint            *end_offset)
+{
+  GtkIconViewItemAccessible *item;
+  GtkTextIter start, end;
+  GtkTextBuffer *buffer;
+  GtkIconView *icon_view;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return NULL;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return NULL;
+
+  buffer = item->text_buffer;
+
+  if (!gtk_text_buffer_get_char_count (buffer))
+    {
+      *start_offset = 0;
+      *end_offset = 0;
+      return g_strdup ("");
+    }
+  gtk_text_buffer_get_iter_at_offset (buffer, &start, offset);
+   
+  end = start;
+
+  switch (boundary_type)
+    {
+    case ATK_TEXT_BOUNDARY_CHAR:
+      gtk_text_iter_backward_char(&start);
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_START:
+      if (!gtk_text_iter_starts_word (&start))
+        gtk_text_iter_backward_word_start (&start);
+      end = start;
+      gtk_text_iter_backward_word_start(&start);
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_END:
+      if (gtk_text_iter_inside_word (&start) &&
+          !gtk_text_iter_starts_word (&start))
+        gtk_text_iter_backward_word_start (&start);
+      while (!gtk_text_iter_ends_word (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      end = start;
+      gtk_text_iter_backward_word_start(&start);
+      while (!gtk_text_iter_ends_word (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+      if (!gtk_text_iter_starts_sentence (&start))
+        gtk_text_iter_backward_sentence_start (&start);
+      end = start;
+      gtk_text_iter_backward_sentence_start (&start);
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
+      if (gtk_text_iter_inside_sentence (&start) &&
+          !gtk_text_iter_starts_sentence (&start))
+        gtk_text_iter_backward_sentence_start (&start);
+      while (!gtk_text_iter_ends_sentence (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      end = start;
+      gtk_text_iter_backward_sentence_start (&start);
+      while (!gtk_text_iter_ends_sentence (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      break;
+   case ATK_TEXT_BOUNDARY_LINE_START:
+   case ATK_TEXT_BOUNDARY_LINE_END:
+      icon_view = GTK_ICON_VIEW (item->widget);
+      gtk_icon_view_update_item_text (icon_view, item->item);
+      get_pango_text_offsets (icon_view->priv->layout,
+                              buffer,
+                              0,
+                              boundary_type,
+                              offset,
+                              start_offset,
+                              end_offset,
+                              &start,
+                              &end);
+      break;
+    }
+
+  *start_offset = gtk_text_iter_get_offset (&start);
+  *end_offset = gtk_text_iter_get_offset (&end);
+
+  return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+}
+
+static gchar*
+gtk_icon_view_item_accessible_text_get_text_at_offset (AtkText         *text,
+                                                       gint            offset,
+                                                       AtkTextBoundary boundary_type,
+                                                       gint            *start_offset,
+                                                       gint            *end_offset)
+{
+  GtkIconViewItemAccessible *item;
+  GtkTextIter start, end;
+  GtkTextBuffer *buffer;
+  GtkIconView *icon_view;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return NULL;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return NULL;
+
+  buffer = item->text_buffer;
+
+  if (!gtk_text_buffer_get_char_count (buffer))
+    {
+      *start_offset = 0;
+      *end_offset = 0;
+      return g_strdup ("");
+    }
+  gtk_text_buffer_get_iter_at_offset (buffer, &start, offset);
+   
+  end = start;
+
+  switch (boundary_type)
+    {
+    case ATK_TEXT_BOUNDARY_CHAR:
+      gtk_text_iter_forward_char (&end);
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_START:
+      if (!gtk_text_iter_starts_word (&start))
+        gtk_text_iter_backward_word_start (&start);
+      if (gtk_text_iter_inside_word (&end))
+        gtk_text_iter_forward_word_end (&end);
+      while (!gtk_text_iter_starts_word (&end))
+        {
+          if (!gtk_text_iter_forward_char (&end))
+            break;
+        }
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_END:
+      if (gtk_text_iter_inside_word (&start) &&
+          !gtk_text_iter_starts_word (&start))
+        gtk_text_iter_backward_word_start (&start);
+      while (!gtk_text_iter_ends_word (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      gtk_text_iter_forward_word_end (&end);
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+      if (!gtk_text_iter_starts_sentence (&start))
+        gtk_text_iter_backward_sentence_start (&start);
+      if (gtk_text_iter_inside_sentence (&end))
+        gtk_text_iter_forward_sentence_end (&end);
+      while (!gtk_text_iter_starts_sentence (&end))
+        {
+          if (!gtk_text_iter_forward_char (&end))
+            break;
+        }
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
+      if (gtk_text_iter_inside_sentence (&start) &&
+          !gtk_text_iter_starts_sentence (&start))
+        gtk_text_iter_backward_sentence_start (&start);
+      while (!gtk_text_iter_ends_sentence (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      gtk_text_iter_forward_sentence_end (&end);
+      break;
+   case ATK_TEXT_BOUNDARY_LINE_START:
+   case ATK_TEXT_BOUNDARY_LINE_END:
+      icon_view = GTK_ICON_VIEW (item->widget);
+      gtk_icon_view_update_item_text (icon_view, item->item);
+      get_pango_text_offsets (icon_view->priv->layout,
+                              buffer,
+                              1,
+                              boundary_type,
+                              offset,
+                              start_offset,
+                              end_offset,
+                              &start,
+                              &end);
+      break;
+    }
+
+
+  *start_offset = gtk_text_iter_get_offset (&start);
+  *end_offset = gtk_text_iter_get_offset (&end);
+
+  return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+}
+
+static gchar*
+gtk_icon_view_item_accessible_text_get_text_after_offset (AtkText         *text,
+                                                          gint            offset,
+                                                          AtkTextBoundary boundary_type,
+                                                          gint            *start_offset,
+                                                          gint            *end_offset)
+{
+  GtkIconViewItemAccessible *item;
+  GtkTextIter start, end;
+  GtkTextBuffer *buffer;
+  GtkIconView *icon_view;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return NULL;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return NULL;
+
+  buffer = item->text_buffer;
+
+  if (!gtk_text_buffer_get_char_count (buffer))
+    {
+      *start_offset = 0;
+      *end_offset = 0;
+      return g_strdup ("");
+    }
+  gtk_text_buffer_get_iter_at_offset (buffer, &start, offset);
+   
+  end = start;
+
+  switch (boundary_type)
+    {
+    case ATK_TEXT_BOUNDARY_CHAR:
+      gtk_text_iter_forward_char(&start);
+      gtk_text_iter_forward_chars(&end, 2);
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_START:
+      if (gtk_text_iter_inside_word (&end))
+        gtk_text_iter_forward_word_end (&end);
+      while (!gtk_text_iter_starts_word (&end))
+        {
+          if (!gtk_text_iter_forward_char (&end))
+            break;
+        }
+      start = end;
+      if (!gtk_text_iter_is_end (&end))
+        {
+          gtk_text_iter_forward_word_end (&end);
+          while (!gtk_text_iter_starts_word (&end))
+            {
+              if (!gtk_text_iter_forward_char (&end))
+                break;
+            }
+        }
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_END:
+      gtk_text_iter_forward_word_end (&end);
+      start = end;
+      if (!gtk_text_iter_is_end (&end))
+        gtk_text_iter_forward_word_end (&end);
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+      if (gtk_text_iter_inside_sentence (&end))
+        gtk_text_iter_forward_sentence_end (&end);
+      while (!gtk_text_iter_starts_sentence (&end))
+        {
+          if (!gtk_text_iter_forward_char (&end))
+            break;
+        }
+      start = end;
+      if (!gtk_text_iter_is_end (&end))
+        {
+          gtk_text_iter_forward_sentence_end (&end);
+          while (!gtk_text_iter_starts_sentence (&end))
+            {
+              if (!gtk_text_iter_forward_char (&end))
+                break;
+            }
+        }
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
+      gtk_text_iter_forward_sentence_end (&end);
+      start = end;
+      if (!gtk_text_iter_is_end (&end))
+        gtk_text_iter_forward_sentence_end (&end);
+      break;
+   case ATK_TEXT_BOUNDARY_LINE_START:
+   case ATK_TEXT_BOUNDARY_LINE_END:
+      icon_view = GTK_ICON_VIEW (item->widget);
+      gtk_icon_view_update_item_text (icon_view, item->item);
+      get_pango_text_offsets (icon_view->priv->layout,
+                              buffer,
+                              2,
+                              boundary_type,
+                              offset,
+                              start_offset,
+                              end_offset,
+                              &start,
+                              &end);
+      break;
+    }
+  *start_offset = gtk_text_iter_get_offset (&start);
+  *end_offset = gtk_text_iter_get_offset (&end);
+
+  return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+}
+
+static gint
+gtk_icon_view_item_accessible_text_get_character_count (AtkText *text)
+{
+  GtkIconViewItemAccessible *item;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return 0;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return 0;
+
+  return gtk_text_buffer_get_char_count (item->text_buffer);
+}
+
+static void
+gtk_icon_view_item_accessible_text_get_character_extents (AtkText      *text,
+                                                          gint         offset,
+                                                          gint         *x,
+                                                          gint         *y,
+                                                          gint         *width,
+                                                          gint         *height,
+                                                          AtkCoordType coord_type)
+{
+  GtkIconViewItemAccessible *item;
+  GtkIconView *icon_view;
+  PangoRectangle char_rect;
+  const gchar *item_text;
+  gint index;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return;
+
+  icon_view = GTK_ICON_VIEW (item->widget);
+  gtk_icon_view_update_item_text (icon_view, item->item);
+  item_text = pango_layout_get_text (icon_view->priv->layout);
+  index = g_utf8_offset_to_pointer (item_text, offset) - item_text;
+  pango_layout_index_to_pos (icon_view->priv->layout, index, &char_rect);
+
+  atk_component_get_position (ATK_COMPONENT (text), x, y, coord_type);
+  *x += item->item->layout_x - item->item->x + char_rect.x / PANGO_SCALE;
+  /* Look at gtk_icon_view_paint_item() to see where the text is. */
+  *x -=  ((item->item->width - item->item->layout_width) / 2) + (MAX (item->item->pixbuf_width, icon_view->priv->item_width) - item->item->width) / 2,
+  *y += item->item->layout_y - item->item->y + char_rect.y / PANGO_SCALE;
+  *width = char_rect.width / PANGO_SCALE;
+  *height = char_rect.height / PANGO_SCALE;
+}
+
+static gint
+gtk_icon_view_item_accessible_text_get_offset_at_point (AtkText      *text,
+                                                        gint          x,
+                                                        gint          y,
+                                                        AtkCoordType coord_type)
+{
+  GtkIconViewItemAccessible *item;
+  GtkIconView *icon_view;
+  const gchar *item_text;
+  gint index;
+  gint offset;
+  gint l_x, l_y;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return -1;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return -1;
+
+  icon_view = GTK_ICON_VIEW (item->widget);
+  gtk_icon_view_update_item_text (icon_view, item->item);
+  atk_component_get_position (ATK_COMPONENT (text), &l_x, &l_y, coord_type);
+  x -= l_x + item->item->layout_x - item->item->x;
+  x +=  ((item->item->width - item->item->layout_width) / 2) + (MAX (item->item->pixbuf_width, icon_view->priv->item_width) - item->item->width) / 2,
+  y -= l_y + item->item->layout_y - item->item->y;
+  item_text = pango_layout_get_text (icon_view->priv->layout);
+  if (!pango_layout_xy_to_index (icon_view->priv->layout, 
+                                x * PANGO_SCALE,
+                                y * PANGO_SCALE,
+                                &index, NULL))
+    {
+      if (x < 0 || y < 0)
+        index = 0;
+      else
+        index = -1;
+    } 
+  if (index == -1)
+    offset = g_utf8_strlen (item_text, -1);
+  else
+    offset = g_utf8_pointer_to_offset (item_text, item_text + index);
+
+  return offset;
+}
+
+static void
+atk_text_item_interface_init (AtkTextIface *iface)
+{
+  iface->get_text = gtk_icon_view_item_accessible_text_get_text;
+  iface->get_character_at_offset = gtk_icon_view_item_accessible_text_get_character_at_offset;
+  iface->get_text_before_offset = gtk_icon_view_item_accessible_text_get_text_before_offset;
+  iface->get_text_at_offset = gtk_icon_view_item_accessible_text_get_text_at_offset;
+  iface->get_text_after_offset = gtk_icon_view_item_accessible_text_get_text_after_offset;
+  iface->get_character_count = gtk_icon_view_item_accessible_text_get_character_count;
+  iface->get_character_extents = gtk_icon_view_item_accessible_text_get_character_extents;
+  iface->get_offset_at_point = gtk_icon_view_item_accessible_text_get_offset_at_point;
+}
+
+static void
+gtk_icon_view_item_accessible_get_extents (AtkComponent *component,
+                                           gint         *x,
+                                           gint         *y,
+                                           gint         *width,
+                                           gint         *height,
+                                           AtkCoordType  coord_type)
+{
+  GtkIconViewItemAccessible *item;
+  AtkObject *parent_obj;
+  gint l_x, l_y;
+
+  g_return_if_fail (GTK_IS_ICON_VIEW_ITEM_ACCESSIBLE (component));
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (component);
+  if (!GTK_IS_WIDGET (item->widget))
+    return;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return;
+
+  *width = item->item->width;
+  *height = item->item->height;
+  if (gtk_icon_view_item_accessible_is_showing (item))
+    {
+      parent_obj = gtk_widget_get_accessible (item->widget);
+      atk_component_get_position (ATK_COMPONENT (parent_obj), &l_x, &l_y, coord_type);
+      *x = l_x + item->item->x;
+      *y = l_y + item->item->y;
+    }
+  else
+    {
+      *x = G_MININT;
+      *y = G_MININT;
+    }
+}
+
+static gboolean
+gtk_icon_view_item_accessible_grab_focus (AtkComponent *component)
+{
+  GtkIconViewItemAccessible *item;
+  GtkWidget *toplevel;
+
+  g_return_val_if_fail (GTK_IS_ICON_VIEW_ITEM_ACCESSIBLE (component), FALSE);
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (component);
+  if (!GTK_IS_WIDGET (item->widget))
+    return FALSE;
+
+  gtk_widget_grab_focus (item->widget);
+  gtk_icon_view_set_cursor_item (GTK_ICON_VIEW (item->widget), item->item);
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item->widget));
+  if (GTK_WIDGET_TOPLEVEL (toplevel))
+    gtk_window_present (GTK_WINDOW (toplevel));
+
+  return TRUE;
+}
+
+static void
+atk_component_item_interface_init (AtkComponentIface *iface)
+{
+  iface->get_extents = gtk_icon_view_item_accessible_get_extents;
+  iface->grab_focus = gtk_icon_view_item_accessible_grab_focus;
+}
+
+static gboolean
+gtk_icon_view_item_accessible_add_state (GtkIconViewItemAccessible *item,
+                                         AtkStateType               state_type,
+                                         gboolean                   emit_signal)
+{
+  gboolean rc;
+
+  rc = atk_state_set_add_state (item->state_set, state_type);
+  /*
+   * The signal should only be generated if the value changed,
+   * not when the item is set up.  So states that are set
+   * initially should pass FALSE as the emit_signal argument.
+   */
+
+  if (emit_signal)
+    {
+      atk_object_notify_state_change (ATK_OBJECT (item), state_type, TRUE);
+      /* If state_type is ATK_STATE_VISIBLE, additional notification */
+      if (state_type == ATK_STATE_VISIBLE)
+        g_signal_emit_by_name (item, "visible_data_changed");
+    }
+
+  return rc;
+}
+
+static gboolean
+gtk_icon_view_item_accessible_remove_state (GtkIconViewItemAccessible *item,
+                                            AtkStateType               state_type,
+                                            gboolean                   emit_signal)
+{
+  if (atk_state_set_contains_state (item->state_set, state_type))
+    {
+      gboolean rc;
+
+      rc = atk_state_set_remove_state (item->state_set, state_type);
+      /*
+       * The signal should only be generated if the value changed,
+       * not when the item is set up.  So states that are set
+       * initially should pass FALSE as the emit_signal argument.
+       */
+
+      if (emit_signal)
+        {
+          atk_object_notify_state_change (ATK_OBJECT (item), state_type, FALSE);
+          /* If state_type is ATK_STATE_VISIBLE, additional notification */
+          if (state_type == ATK_STATE_VISIBLE)
+            g_signal_emit_by_name (item, "visible_data_changed");
+        }
+
+      return rc;
+    }
+  else
+    return FALSE;
+}
+
+static gboolean
+gtk_icon_view_item_accessible_is_showing (GtkIconViewItemAccessible *item)
+{
+  GtkIconView *icon_view;
+  GdkRectangle visible_rect;
+  gboolean is_showing;
+
+  /*
+   * An item is considered "SHOWING" if any part of the item is in the
+   * visible rectangle.
+   */
+
+  if (!GTK_IS_ICON_VIEW (item->widget))
+    return FALSE;
+
+  if (item->item == NULL)
+    return FALSE;
+
+  icon_view = GTK_ICON_VIEW (item->widget);
+  visible_rect.x = 0;
+  if (icon_view->priv->hadjustment)
+    visible_rect.x += icon_view->priv->hadjustment->value;
+  visible_rect.y = 0;
+  if (icon_view->priv->hadjustment)
+    visible_rect.y += icon_view->priv->vadjustment->value;
+  visible_rect.width = item->widget->allocation.width;
+  visible_rect.height = item->widget->allocation.height;
+
+  if (((item->item->x + item->item->width) < visible_rect.x) ||
+     ((item->item->y + item->item->height) < (visible_rect.y)) ||
+     (item->item->x > (visible_rect.x + visible_rect.width)) ||
+     (item->item->y > (visible_rect.y + visible_rect.height)))
+    is_showing =  FALSE;
+  else
+    is_showing = TRUE;
+
+  return is_showing;
+}
+
+static gboolean
+gtk_icon_view_item_accessible_set_visibility (GtkIconViewItemAccessible *item,
+                                              gboolean                   emit_signal)
+{
+  if (gtk_icon_view_item_accessible_is_showing (item))
+    return gtk_icon_view_item_accessible_add_state (item, ATK_STATE_SHOWING,
+                                                   emit_signal);
+  else
+    return gtk_icon_view_item_accessible_remove_state (item, ATK_STATE_SHOWING,
+                                                      emit_signal);
+}
+
+static void
+gtk_icon_view_item_accessible_object_init (GtkIconViewItemAccessible *item)
+{
+  gint i;
+
+  item->state_set = atk_state_set_new ();
+
+  atk_state_set_add_state (item->state_set, ATK_STATE_ENABLED);
+  atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSABLE);
+  atk_state_set_add_state (item->state_set, ATK_STATE_SENSITIVE);
+  atk_state_set_add_state (item->state_set, ATK_STATE_SELECTABLE);
+  atk_state_set_add_state (item->state_set, ATK_STATE_VISIBLE);
+
+  for (i = 0; i < LAST_ACTION; i++)
+    item->action_descriptions[i] = NULL;
+
+  item->image_description = NULL;
+
+  item->action_idle_handler = 0;
+}
+
+static void
+gtk_icon_view_item_accessible_finalize (GObject *object)
+{
+  GtkIconViewItemAccessible *item;
+  gint i;
+
+  g_return_if_fail (GTK_IS_ICON_VIEW_ITEM_ACCESSIBLE (object));
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (object);
+
+  if (item->widget)
+    g_object_remove_weak_pointer (G_OBJECT (item->widget), (gpointer) &item->widget);
+
+  if (item->state_set)
+    g_object_unref (item->state_set);
+
+  if (item->text_buffer)
+     g_object_unref (item->text_buffer);
+
+  for (i = 0; i < LAST_ACTION; i++)
+    g_free (item->action_descriptions[i]);
+
+  g_free (item->image_description);
+
+  if (item->action_idle_handler)
+    {
+      g_source_remove (item->action_idle_handler);
+      item->action_idle_handler = 0;
+    }
+
+  G_OBJECT_CLASS (accessible_item_parent_class)->finalize (object);
+}
+
+static G_CONST_RETURN gchar*
+gtk_icon_view_item_accessible_get_name (AtkObject *obj)
+{
+  if (obj->name)
+    return obj->name;
+  else
+    {
+      GtkIconViewItemAccessible *item;
+      GtkTextIter start_iter;
+      GtkTextIter end_iter;
+
+      item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (obj);
+      gtk_text_buffer_get_start_iter (item->text_buffer, &start_iter); 
+      gtk_text_buffer_get_end_iter (item->text_buffer, &end_iter); 
+
+      return gtk_text_buffer_get_text (item->text_buffer, &start_iter, &end_iter, FALSE);
+    }
+}
+
+static AtkObject*
+gtk_icon_view_item_accessible_get_parent (AtkObject *obj)
+{
+  GtkIconViewItemAccessible *item;
+
+  g_return_val_if_fail (GTK_IS_ICON_VIEW_ITEM_ACCESSIBLE (obj), NULL);
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (obj);
+
+  if (item->widget)
+    return gtk_widget_get_accessible (item->widget);
+  else
+    return NULL;
+}
+
+static gint
+gtk_icon_view_item_accessible_get_index_in_parent (AtkObject *obj)
+{
+  GtkIconViewItemAccessible *item;
+
+  g_return_val_if_fail (GTK_IS_ICON_VIEW_ITEM_ACCESSIBLE (obj), 0);
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (obj);
+
+  return item->item->index; 
+}
+
+static AtkStateSet *
+gtk_icon_view_item_accessible_ref_state_set (AtkObject *obj)
+{
+  GtkIconViewItemAccessible *item;
+  GtkIconView *icon_view;
+
+  item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (obj);
+  g_return_val_if_fail (item->state_set, NULL);
+
+  if (!item->widget)
+    return NULL;
+
+  icon_view = GTK_ICON_VIEW (item->widget);
+  if (icon_view->priv->cursor_item == item->item)
+    atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSED);
+  else
+    atk_state_set_remove_state (item->state_set, ATK_STATE_FOCUSED);
+
+  return g_object_ref (item->state_set);
+}
+
+static void
+gtk_icon_view_item_accessible_class_init (AtkObjectClass *klass)
+{
+  GObjectClass *gobject_class;
+
+  accessible_item_parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = (GObjectClass *)klass;
+
+  gobject_class->finalize = gtk_icon_view_item_accessible_finalize;
+
+  klass->get_index_in_parent = gtk_icon_view_item_accessible_get_index_in_parent; 
+  klass->get_name = gtk_icon_view_item_accessible_get_name; 
+  klass->get_parent = gtk_icon_view_item_accessible_get_parent; 
+  klass->ref_state_set = gtk_icon_view_item_accessible_ref_state_set; 
+}
+
+static GType
+gtk_icon_view_item_accessible_get_type (void)
+{
+  static GType type = 0;
+
+  if (!type)
+    {
+      static const GTypeInfo tinfo =
+      {
+        sizeof (GtkIconViewItemAccessibleClass),
+        (GBaseInitFunc) NULL, /* base init */
+        (GBaseFinalizeFunc) NULL, /* base finalize */
+        (GClassInitFunc) gtk_icon_view_item_accessible_class_init, /* class init */
+        (GClassFinalizeFunc) NULL, /* class finalize */
+        NULL, /* class data */
+        sizeof (GtkIconViewItemAccessible), /* instance size */
+        0, /* nb preallocs */
+        (GInstanceInitFunc) gtk_icon_view_item_accessible_object_init, /* instance init */
+        NULL /* value table */
+      };
+
+      static const GInterfaceInfo atk_component_info =
+      {
+        (GInterfaceInitFunc) atk_component_item_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+      static const GInterfaceInfo atk_action_info =
+      {
+        (GInterfaceInitFunc) atk_action_item_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+      static const GInterfaceInfo atk_image_info =
+      {
+        (GInterfaceInitFunc) atk_image_item_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+      static const GInterfaceInfo atk_text_info =
+      {
+        (GInterfaceInitFunc) atk_text_item_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+
+      type = g_type_register_static (ATK_TYPE_OBJECT,
+                                     "GtkIconViewItemAccessible", &tinfo, 0);
+      g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
+                                   &atk_component_info);
+      g_type_add_interface_static (type, ATK_TYPE_ACTION,
+                                   &atk_action_info);
+      g_type_add_interface_static (type, ATK_TYPE_IMAGE,
+                                   &atk_image_info);
+      g_type_add_interface_static (type, ATK_TYPE_TEXT,
+                                   &atk_text_info);
+    }
+
+  return type;
+}
+
+#define GTK_TYPE_ICON_VIEW_ACCESSIBLE      (gtk_icon_view_accessible_get_type ())
+#define GTK_ICON_VIEW_ACCESSIBLE(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ICON_VIEW_ACCESSIBLE, GtkIconViewAccessible))
+#define GTK_IS_ICON_VIEW_ACCESSIBLE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ICON_VIEW_ACCESSIBLE))
+
+static GType gtk_icon_view_accessible_get_type (void);
+
+typedef struct
+{
+   AtkObject parent;
+} GtkIconViewAccessible;
+
+typedef struct
+{
+  AtkObject *item;
+  gint       index;
+} GtkIconViewItemAccessibleInfo;
+
+typedef struct
+{
+  GList *items;
+
+  GtkAdjustment *old_hadj;
+  GtkAdjustment *old_vadj;
+
+  GtkTreeModel *model;
+
+} GtkIconViewAccessiblePrivate;
+
+static GtkIconViewAccessiblePrivate *
+gtk_icon_view_accessible_get_priv (AtkObject *accessible)
+{
+  return g_object_get_qdata (G_OBJECT (accessible),
+                             accessible_private_data_quark);
+}
+
+static void
+gtk_icon_view_item_accessible_info_new (AtkObject *accessible,
+                                        AtkObject *item,
+                                        gint       index)
+{
+  GtkIconViewItemAccessibleInfo *info;
+  GtkIconViewItemAccessibleInfo *tmp_info;
+  GtkIconViewAccessiblePrivate *priv;
+  GList *items;
+
+  info = g_new (GtkIconViewItemAccessibleInfo, 1);
+  info->item = item;
+  info->index = index;
+
+  priv = gtk_icon_view_accessible_get_priv (accessible);
+  items = priv->items;
+  while (items)
+    {
+      tmp_info = items->data;
+      if (tmp_info->index > index)
+        break;
+      items = items->next;
+    }
+  priv->items = g_list_insert_before (priv->items, items, info);
+  priv->old_hadj = NULL;
+  priv->old_vadj = NULL;
+}
+
+static gint
+gtk_icon_view_accessible_get_n_children (AtkObject *accessible)
+{
+  GtkIconView *icon_view;
+  GtkWidget *widget;
+
+  widget = GTK_ACCESSIBLE (accessible)->widget;
+  if (!widget)
+      return 0;
+
+  icon_view = GTK_ICON_VIEW (widget);
+
+  return g_list_length (icon_view->priv->items);
+}
+
+static AtkObject *
+gtk_icon_view_accessible_find_child (AtkObject *accessible,
+                                     gint       index)
+{
+  GtkIconViewAccessiblePrivate *priv;
+  GtkIconViewItemAccessibleInfo *info;
+  GList *items;
+
+  priv = gtk_icon_view_accessible_get_priv (accessible);
+  items = priv->items;
+
+  while (items)
+    {
+      info = items->data;
+      if (info->index == index)
+        return info->item;
+      items = items->next; 
+    }
+  return NULL;
+}
+
+static AtkObject *
+gtk_icon_view_accessible_ref_child (AtkObject *accessible,
+                                    gint       index)
+{
+  GtkIconView *icon_view;
+  GtkWidget *widget;
+  GList *icons;
+  AtkObject *obj;
+  GtkIconViewItemAccessible *a11y_item;
+
+  widget = GTK_ACCESSIBLE (accessible)->widget;
+  if (!widget)
+    return NULL;
+
+  icon_view = GTK_ICON_VIEW (widget);
+  icons = g_list_nth (icon_view->priv->items, index);
+  obj = NULL;
+  if (icons)
+    {
+      GtkIconViewItem *item = icons->data;
+   
+      g_return_val_if_fail (item->index == index, NULL);
+      obj = gtk_icon_view_accessible_find_child (accessible, index);
+      if (!obj)
+        {
+          obj = g_object_new (gtk_icon_view_item_accessible_get_type (), NULL);
+          gtk_icon_view_item_accessible_info_new (accessible,
+                                                  obj,
+                                                  index);
+          obj->role = ATK_ROLE_ICON;
+          a11y_item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (obj);
+          a11y_item->item = item;
+          a11y_item->widget = widget;
+          a11y_item->text_buffer = gtk_text_buffer_new (NULL);
+          gtk_icon_view_update_item_text (icon_view, item);
+          gtk_text_buffer_set_text (a11y_item->text_buffer, 
+                                    pango_layout_get_text (icon_view->priv->layout), 
+                                    -1);
+          gtk_icon_view_item_accessible_set_visibility (a11y_item, FALSE);
+          g_object_add_weak_pointer (G_OBJECT (widget), (gpointer) &(a11y_item->widget));
+       }
+      g_object_ref (obj);
+    }
+  return obj;
+}
+
+static void
+gtk_icon_view_accessible_traverse_items (GtkIconViewAccessible *view,
+                                         GList                 *list)
+{
+  GtkIconViewAccessiblePrivate *priv;
+  GtkIconViewItemAccessibleInfo *info;
+  GtkIconViewItemAccessible *item;
+  GList *items;
+  
+  priv =  gtk_icon_view_accessible_get_priv (ATK_OBJECT (view));
+  if (priv->items)
+    {
+      GtkWidget *widget;
+      gboolean act_on_item;
+
+      widget = GTK_ACCESSIBLE (view)->widget;
+      if (widget == NULL)
+        return;
+
+      items = priv->items;
+
+      act_on_item = (list == NULL);
+
+      while (items)
+        {
+
+          info = (GtkIconViewItemAccessibleInfo *)items->data;
+          item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item);
+
+          if (act_on_item == FALSE && list == items)
+            act_on_item = TRUE;
+
+          if (act_on_item)
+           gtk_icon_view_item_accessible_set_visibility (item, TRUE);
+
+          items = items->next;
+       }
+   }
+}
+
+static void
+gtk_icon_view_accessible_adjustment_changed (GtkAdjustment *adjustment,
+                                             GtkIconView   *icon_view)
+{
+  AtkObject *obj;
+  GtkIconViewAccessible *view;
+
+  /*
+   * The scrollbars have changed
+   */
+  obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
+  view = GTK_ICON_VIEW_ACCESSIBLE (obj);
+
+  gtk_icon_view_accessible_traverse_items (view, NULL);
+}
+
+static void
+gtk_icon_view_accessible_set_scroll_adjustments (GtkWidget      *widget,
+                                                 GtkAdjustment *hadj,
+                                                 GtkAdjustment *vadj)
+{
+  AtkObject *atk_obj;
+  GtkIconViewAccessiblePrivate *priv;
+
+  atk_obj = gtk_widget_get_accessible (widget);
+  priv = gtk_icon_view_accessible_get_priv (atk_obj);
+
+  if (priv->old_hadj != hadj)
+    {
+      if (priv->old_hadj)
+        {
+          g_object_remove_weak_pointer (G_OBJECT (priv->old_hadj),
+                                        (gpointer *)&priv->old_hadj);
+          
+          g_signal_handlers_disconnect_by_func (priv->old_hadj,
+                                                (gpointer) gtk_icon_view_accessible_adjustment_changed,
+                                                widget);
+        }
+      priv->old_hadj = hadj;
+      if (priv->old_hadj)
+        {
+          g_object_add_weak_pointer (G_OBJECT (priv->old_hadj),
+                                     (gpointer *)&priv->old_hadj);
+          g_signal_connect (hadj,
+                            "value-changed",
+                            G_CALLBACK (gtk_icon_view_accessible_adjustment_changed),
+                            widget);
+        }
+    }
+  if (priv->old_vadj != vadj)
+    {
+      if (priv->old_vadj)
+        {
+          g_object_remove_weak_pointer (G_OBJECT (priv->old_vadj),
+                                        (gpointer *)&priv->old_vadj);
+          
+          g_signal_handlers_disconnect_by_func (priv->old_vadj,
+                                                (gpointer) gtk_icon_view_accessible_adjustment_changed,
+                                                widget);
+        }
+      priv->old_vadj = vadj;
+      if (priv->old_vadj)
+        {
+          g_object_add_weak_pointer (G_OBJECT (priv->old_vadj),
+                                     (gpointer *)&priv->old_vadj);
+          g_signal_connect (vadj,
+                            "value-changed",
+                            G_CALLBACK (gtk_icon_view_accessible_adjustment_changed),
+                            widget);
+        }
+    }
 }
 
-G_CONST_RETURN gchar *
-egg_icon_list_item_get_label (EggIconListItem *item)
+static void
+gtk_icon_view_accessible_model_row_changed (GtkTreeModel *tree_model,
+                                            GtkTreePath  *path,
+                                            GtkTreeIter  *iter,
+                                            gpointer     user_data)
 {
-  g_return_val_if_fail (item != NULL, NULL);
+  AtkObject *atk_obj;
 
-  return item->label;
+  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
+  g_signal_emit_by_name (atk_obj, "visible-data-changed");
+
+  return;
 }
 
-void
-egg_icon_list_item_set_icon (EggIconListItem  *item,
-                            GdkPixbuf        *icon)
+static void
+gtk_icon_view_accessible_model_row_inserted (GtkTreeModel *tree_model,
+                                             GtkTreePath  *path,
+                                             GtkTreeIter  *iter,
+                                             gpointer     user_data)
 {
-  g_return_if_fail (item != NULL);
-
-  if (icon == item->icon)
-    return;
+  GtkIconViewAccessiblePrivate *priv;
+  GtkIconViewItemAccessibleInfo *info;
+  GtkIconViewAccessible *view;
+  GtkIconViewItemAccessible *item;
+  GList *items;
+  GList *tmp_list;
+  AtkObject *atk_obj;
+  gint index;
 
-  g_object_unref (item->icon);
-  item->icon = g_object_ref (icon);
+  index = gtk_tree_path_get_indices(path)[0];
+  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
+  view = GTK_ICON_VIEW_ACCESSIBLE (atk_obj);
+  priv = gtk_icon_view_accessible_get_priv (atk_obj);
 
-  egg_icon_list_item_invalidate_size (item);
+  items = priv->items;
+  tmp_list = NULL;
+  while (items)
+    {
+      info = items->data;
+      item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item);
+      if (info->index != item->item->index)
+        {
+          if (info->index < index)
+            g_warning ("Unexpected index value on insertion %d %d", index, info->index);
+          if (tmp_list == NULL)
+            tmp_list = items;
+   
+          info->index = item->item->index;
+        }
 
-  egg_icon_list_queue_layout (item->icon_list);
+      items = items->next;
+    }
+  gtk_icon_view_accessible_traverse_items (view, tmp_list);
+  g_signal_emit_by_name (atk_obj, "children_changed::add",
+                         index, NULL, NULL);
+  return;
 }
 
-GdkPixbuf *
-egg_icon_list_item_get_icon (EggIconListItem  *item)
+static void
+gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model,
+                                            GtkTreePath  *path,
+                                            gpointer     user_data)
 {
-  g_return_val_if_fail (item != NULL, NULL);
-
-  return item->icon;
-}
+  GtkIconViewAccessiblePrivate *priv;
+  GtkIconViewItemAccessibleInfo *info;
+  GtkIconViewAccessible *view;
+  GtkIconViewItemAccessible *item;
+  GList *items;
+  GList *tmp_list;
+  GList *deleted_item;
+  AtkObject *atk_obj;
+  gint index;
+
+  index = gtk_tree_path_get_indices(path)[0];
+  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
+  view = GTK_ICON_VIEW_ACCESSIBLE (atk_obj);
+  priv = gtk_icon_view_accessible_get_priv (atk_obj);
+
+  items = priv->items;
+  tmp_list = NULL;
+  deleted_item = NULL;
+  info = NULL;
+  while (items)
+    {
+      info = items->data;
+      item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item);
+      if (info->index == index)
+        {
+          deleted_item = items;
+        }
+      if (info->index != item->item->index)
+        {
+          if (tmp_list == NULL)
+            tmp_list = items;
+          else    
+            info->index = item->item->index;
+        }
 
-void
-egg_icon_list_append_item (EggIconList     *icon_list,
-                          EggIconListItem *item)
-{
-  GList *list;
-  
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-  g_return_if_fail (item != NULL);
-  g_return_if_fail (item->icon_list == NULL);
-  
-  if (icon_list->priv->sorted)
+      items = items->next;
+    }
+  gtk_icon_view_accessible_traverse_items (view, tmp_list);
+  if (deleted_item)
     {
-      egg_icon_list_insert_item_sorted (icon_list, item);
-      return;
+      info = deleted_item->data;
+      gtk_icon_view_item_accessible_add_state (GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item), ATK_STATE_DEFUNCT, TRUE);
     }
-
-  egg_icon_list_validate (icon_list);
-  
-  list = g_list_alloc ();
-  item->list = list;
-  item->icon_list = icon_list;
-  list->data = item;
-  g_object_ref (item);
-  
-  if (icon_list->priv->last_item)
+  g_signal_emit_by_name (atk_obj, "children_changed::remove",
+                         index, NULL, NULL);
+  if (deleted_item)
     {
-      icon_list->priv->last_item->next = list;
-      list->prev = icon_list->priv->last_item;
+      priv->items = g_list_remove_link (priv->items, deleted_item);
+      g_free (info);
     }
-  else
-      icon_list->priv->items = list;
 
-  icon_list->priv->last_item = list;
-  icon_list->priv->item_count += 1;
-  
-  egg_icon_list_validate (icon_list);
+  return;
+}
 
-  g_signal_emit (icon_list, icon_list_signals[ITEM_ADDED], 0, item);
-  
-  egg_icon_list_queue_layout (icon_list);
+static gint
+gtk_icon_view_accessible_item_compare (GtkIconViewItemAccessibleInfo *i1,
+                                       GtkIconViewItemAccessibleInfo *i2)
+{
+  return i1->index - i2->index;
 }
 
-void
-egg_icon_list_prepend_item (EggIconList      *icon_list,
-                           EggIconListItem  *item)
+static void
+gtk_icon_view_accessible_model_rows_reordered (GtkTreeModel *tree_model,
+                                               GtkTreePath  *path,
+                                               GtkTreeIter  *iter,
+                                               gint         *new_order,
+                                               gpointer     user_data)
 {
-  GList *list;
+  GtkIconViewAccessiblePrivate *priv;
+  GtkIconViewItemAccessibleInfo *info;
+  GtkIconViewAccessible *view;
+  GtkIconView *icon_view;
+  GtkIconViewItemAccessible *item;
+  GList *items;
+  GList *tmp_list;
+  AtkObject *atk_obj;
 
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-  g_return_if_fail (item != NULL);
-  g_return_if_fail (item->icon_list == NULL);
-  
-  egg_icon_list_validate (icon_list);
+  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
+  icon_view = GTK_ICON_VIEW (user_data);
+  view = GTK_ICON_VIEW_ACCESSIBLE (atk_obj);
+  priv = gtk_icon_view_accessible_get_priv (atk_obj);
 
-  list = g_list_alloc ();
-  item->list = list;
-  item->icon_list = icon_list;
-  list->data = item;
-  g_object_ref (item);
-  
-  if (icon_list->priv->last_item == NULL)
-    icon_list->priv->last_item = list;
-  
-  if (icon_list->priv->items)
-      icon_list->priv->items->prev = list;
-  
-  list->next = icon_list->priv->items;
-  icon_list->priv->items = list;
-  icon_list->priv->item_count += 1;
-  
-  egg_icon_list_validate (icon_list);
+  items = priv->items;
+  tmp_list = NULL;
+  while (items)
+    {
+      info = items->data;
+      item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item);
+      info->index = new_order[info->index];
+      tmp_list = g_list_nth (icon_view->priv->items, info->index);
+      item->item = tmp_list->data;
+      items = items->next;
+    }
+  priv->items = g_list_sort (priv->items, 
+                             (GCompareFunc)gtk_icon_view_accessible_item_compare);
 
-  g_signal_emit (icon_list, icon_list_signals[ITEM_ADDED], 0, item);
+  return;
+}
 
-  egg_icon_list_queue_layout (icon_list);
+static void
+gtk_icon_view_accessible_disconnect_model_signals (GtkTreeModel *model,
+                                                   GtkWidget *widget)
+{
+  GObject *obj;
 
+  obj = G_OBJECT (model);
+  g_signal_handlers_disconnect_by_func (obj, (gpointer) gtk_icon_view_accessible_model_row_changed, widget);
+  g_signal_handlers_disconnect_by_func (obj, (gpointer) gtk_icon_view_accessible_model_row_inserted, widget);
+  g_signal_handlers_disconnect_by_func (obj, (gpointer) gtk_icon_view_accessible_model_row_deleted, widget);
+  g_signal_handlers_disconnect_by_func (obj, (gpointer) gtk_icon_view_accessible_model_rows_reordered, widget);
 }
 
+static void
+gtk_icon_view_accessible_connect_model_signals (GtkIconView *icon_view)
+{
+  GObject *obj;
+
+  obj = G_OBJECT (icon_view->priv->model);
+  g_signal_connect_data (obj, "row-changed",
+                         (GCallback) gtk_icon_view_accessible_model_row_changed,
+                         icon_view, NULL, 0);
+  g_signal_connect_data (obj, "row-inserted",
+                         (GCallback) gtk_icon_view_accessible_model_row_inserted, 
+                         icon_view, NULL, G_CONNECT_AFTER);
+  g_signal_connect_data (obj, "row-deleted",
+                         (GCallback) gtk_icon_view_accessible_model_row_deleted, 
+                         icon_view, NULL, G_CONNECT_AFTER);
+  g_signal_connect_data (obj, "rows-reordered",
+                         (GCallback) gtk_icon_view_accessible_model_rows_reordered, 
+                         icon_view, NULL, G_CONNECT_AFTER);
+}
 
-void
-egg_icon_list_insert_item_before (EggIconList      *icon_list,
-                                 EggIconListItem  *sibling,
-                                 EggIconListItem  *item)
+static void
+gtk_icon_view_accessible_clear_cache (GtkIconViewAccessiblePrivate *priv)
 {
-  GList *list;
-  
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-  g_return_if_fail (item != NULL);
-  g_return_if_fail (item->icon_list == NULL);
-  
-  if (icon_list->priv->sorted)
+  GtkIconViewItemAccessibleInfo *info;
+  GList *items;
+
+  items = priv->items;
+  while (items)
     {
-      egg_icon_list_insert_item_sorted (icon_list, item);
-      return;
+      info = (GtkIconViewItemAccessibleInfo *) items->data;
+      g_object_unref (info->item);
+      g_free (items->data);
+      items = items->next;
     }
-  
-  if (sibling == NULL)
-    egg_icon_list_append_item (icon_list, item);
-  
-  egg_icon_list_validate (icon_list);
-
-  list = g_list_alloc ();
-  item->list = list;
-  item->icon_list = icon_list;
-  list->data = item;
-  g_object_ref (item);
-  
-  list->prev = sibling->list->prev;
-  list->next = sibling->list;
-  sibling->list->prev->next = list;
-  sibling->list->prev = list;
+  g_list_free (priv->items);
+  priv->items = NULL;
+}
 
-  if (sibling->list == icon_list->priv->items)
-    icon_list->priv->items = list;
+static void
+gtk_icon_view_accessible_notify_gtk (GObject *obj,
+                                     GParamSpec *pspec)
+{
+  GtkIconView *icon_view;
+  GtkWidget *widget;
+  AtkObject *atk_obj;
+  GtkIconViewAccessible *view;
+  GtkIconViewAccessiblePrivate *priv;
 
-  icon_list->priv->item_count += 1;
-  egg_icon_list_validate (icon_list);
+  if (strcmp (pspec->name, "model") == 0)
+    {
+      widget = GTK_WIDGET (obj); 
+      atk_obj = gtk_widget_get_accessible (widget);
+      view = GTK_ICON_VIEW_ACCESSIBLE (atk_obj);
+      priv = gtk_icon_view_accessible_get_priv (atk_obj);
+      if (priv->model)
+        {
+          g_object_remove_weak_pointer (G_OBJECT (priv->model),
+                                        (gpointer *)&priv->model);
+          gtk_icon_view_accessible_disconnect_model_signals (priv->model, widget);
+        }
+      gtk_icon_view_accessible_clear_cache (priv);
+
+      icon_view = GTK_ICON_VIEW (obj);
+      priv->model = icon_view->priv->model;
+      /* If there is no model the GtkIconView is probably being destroyed */
+      if (priv->model)
+        {
+          g_object_add_weak_pointer (G_OBJECT (priv->model), (gpointer *)&priv->model);
+          gtk_icon_view_accessible_connect_model_signals (icon_view);
+        }
+    }
 
-  g_signal_emit (icon_list, icon_list_signals[ITEM_ADDED], 0, item);
-  
-  egg_icon_list_queue_layout (icon_list);
+  return;
 }
 
-void
-egg_icon_list_insert_item_after  (EggIconList      *icon_list,
-                                 EggIconListItem  *sibling,
-                                 EggIconListItem  *item)
+static void
+gtk_icon_view_accessible_initialize (AtkObject *accessible,
+                                     gpointer   data)
 {
-  GList *list;
+  GtkIconViewAccessiblePrivate *priv;
+  GtkIconView *icon_view;
 
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-  g_return_if_fail (item != NULL);
-  g_return_if_fail (item->icon_list == NULL);
-  
-  if (icon_list->priv->sorted)
+  if (ATK_OBJECT_CLASS (accessible_parent_class)->initialize)
+    ATK_OBJECT_CLASS (accessible_parent_class)->initialize (accessible, data);
+
+  priv = g_new0 (GtkIconViewAccessiblePrivate, 1);
+  g_object_set_qdata (G_OBJECT (accessible),
+                      accessible_private_data_quark,
+                      priv);
+
+  icon_view = GTK_ICON_VIEW (data);
+  if (icon_view->priv->hadjustment)
+    {
+      priv->old_hadj = icon_view->priv->hadjustment;
+      g_object_add_weak_pointer (G_OBJECT (priv->old_hadj), (gpointer *)&priv->old_hadj);
+      g_signal_connect (icon_view->priv->hadjustment,
+                        "value-changed",
+                        G_CALLBACK (gtk_icon_view_accessible_adjustment_changed),
+                        icon_view);
+    } 
+  if (icon_view->priv->vadjustment)
     {
-      egg_icon_list_insert_item_sorted (icon_list, item);
-      return;
+      priv->old_vadj = icon_view->priv->vadjustment;
+      g_object_add_weak_pointer (G_OBJECT (priv->old_vadj), (gpointer *)&priv->old_vadj);
+      g_signal_connect (icon_view->priv->vadjustment,
+                        "value-changed",
+                        G_CALLBACK (gtk_icon_view_accessible_adjustment_changed),
+                        icon_view);
     }
-
-  if (sibling == NULL)
+  g_signal_connect_after (data,
+                          "set_scroll_adjustments",
+                          G_CALLBACK (gtk_icon_view_accessible_set_scroll_adjustments),
+                          NULL);
+  g_signal_connect (data,
+                    "notify",
+                    G_CALLBACK (gtk_icon_view_accessible_notify_gtk),
+                    NULL);
+
+  priv->model = icon_view->priv->model;
+  if (priv->model)
     {
-      egg_icon_list_prepend_item (icon_list, item);
-      return;
+      g_object_add_weak_pointer (G_OBJECT (priv->model), (gpointer *)&priv->model);
+      gtk_icon_view_accessible_connect_model_signals (icon_view);
     }
+                          
+  accessible->role = ATK_ROLE_LAYERED_PANE;
+}
 
-  egg_icon_list_validate (icon_list);
+static void
+gtk_icon_view_accessible_finalize (GObject *object)
+{
+  GtkIconViewAccessiblePrivate *priv;
 
-  list = g_list_alloc ();
-  item->list = list;
-  item->icon_list = icon_list;
-  list->data = item;
-  g_object_ref (item);
-  
-  list->next = sibling->list->next;
-  list->prev = sibling->list;
-  sibling->list->next->prev = list;
-  sibling->list->next = list;
+  priv = gtk_icon_view_accessible_get_priv (ATK_OBJECT (object));
+  gtk_icon_view_accessible_clear_cache (priv);
 
-  if (sibling->list == icon_list->priv->last_item)
-    icon_list->priv->last_item = list;
+  g_free (priv);
 
-  icon_list->priv->item_count += 1;
-  egg_icon_list_validate (icon_list);
-  g_signal_emit (icon_list, icon_list_signals[ITEM_ADDED], 0, item);
-  
-  egg_icon_list_queue_layout (icon_list);
+  G_OBJECT_CLASS (accessible_parent_class)->finalize (object);
 }
 
-void
-egg_icon_list_remove_item (EggIconList      *icon_list,
-                          EggIconListItem  *item)
+static void
+gtk_icon_view_accessible_destroyed (GtkWidget *widget,
+                                    GtkAccessible *accessible)
 {
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-  g_return_if_fail (item != NULL);
-  g_return_if_fail (item->icon_list == icon_list);
-  
-  egg_icon_list_validate (icon_list);
+  AtkObject *atk_obj;
+  GtkIconViewAccessiblePrivate *priv;
 
-  if (item->list->prev)
-    item->list->prev->next = item->list->next;
-  if (item->list->next)
-    item->list->next->prev = item->list->prev;
+  atk_obj = ATK_OBJECT (accessible);
+  priv = gtk_icon_view_accessible_get_priv (atk_obj);
+  if (priv->old_hadj)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (priv->old_hadj),
+                                    (gpointer *)&priv->old_hadj);
+          
+      g_signal_handlers_disconnect_by_func (priv->old_hadj,
+                                            (gpointer) gtk_icon_view_accessible_adjustment_changed,
+                                            widget);
+      priv->old_hadj = NULL;
+    }
+  if (priv->old_vadj)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (priv->old_vadj),
+                                    (gpointer *)&priv->old_vadj);
+          
+      g_signal_handlers_disconnect_by_func (priv->old_vadj,
+                                            (gpointer) gtk_icon_view_accessible_adjustment_changed,
+                                            widget);
+      priv->old_vadj = NULL;
+    }
+}
 
-  if (item->list == icon_list->priv->items)
-    icon_list->priv->items = item->list->next;
-  if (item->list == icon_list->priv->last_item)
-    icon_list->priv->last_item = item->list->prev;
+static void
+gtk_icon_view_accessible_connect_widget_destroyed (GtkAccessible *accessible)
+{
+  if (accessible->widget)
+    {
+      g_signal_connect_after (accessible->widget,
+                              "destroy",
+                              G_CALLBACK (gtk_icon_view_accessible_destroyed),
+                              accessible);
+    }
+  GTK_ACCESSIBLE_CLASS (accessible_parent_class)->connect_widget_destroyed (accessible);
+}
 
-  g_list_free_1 (item->list);
-  item->list = NULL;
-  item->icon_list = NULL;
-  egg_icon_list_item_invalidate_size (item);
-  
-  icon_list->priv->item_count -= 1;
-  egg_icon_list_validate (icon_list);
+static void
+gtk_icon_view_accessible_class_init (AtkObjectClass *klass)
+{
+  GObjectClass *gobject_class;
+  GtkAccessibleClass *accessible_class;
 
-  g_signal_emit (icon_list, icon_list_signals[ITEM_REMOVED], 0, item);
+  accessible_parent_class = g_type_class_peek_parent (klass);
 
-  if (item->selected)
-    {
-      item->selected = FALSE;
+  gobject_class = (GObjectClass *)klass;
+  accessible_class = (GtkAccessibleClass *)klass;
 
-      g_signal_emit (icon_list, icon_list_signals[SELECTION_CHANGED], 0);
-    }
+  gobject_class->finalize = gtk_icon_view_accessible_finalize;
 
-  if (icon_list->priv->cursor_item == item)
-    g_error ("FIXME: Move to first focused item");
+  klass->get_n_children = gtk_icon_view_accessible_get_n_children;
+  klass->ref_child = gtk_icon_view_accessible_ref_child;
+  klass->initialize = gtk_icon_view_accessible_initialize;
 
-  if (icon_list->priv->last_single_clicked == item)
-    icon_list->priv->last_single_clicked = NULL;
-  
-  g_object_unref (item);
-  
-  egg_icon_list_queue_layout (icon_list);
-}
+  accessible_class->connect_widget_destroyed = gtk_icon_view_accessible_connect_widget_destroyed;
 
+  accessible_private_data_quark = g_quark_from_static_string ("icon_view-accessible-private-data");
+}
 
-EggIconListItem *
-egg_icon_list_get_item_at_pos (EggIconList *icon_list,
-                              gint         x,
-                              gint         y)
+static AtkObject*
+gtk_icon_view_accessible_ref_accessible_at_point (AtkComponent *component,
+                                                  gint          x,
+                                                  gint          y,
+                                                  AtkCoordType  coord_type)
 {
-  GList *items;
-  
-  g_return_val_if_fail (EGG_IS_ICON_LIST (icon_list), NULL);
+  GtkWidget *widget;
+  GtkIconView *icon_view;
+  GtkIconViewItem *item;
+  gint x_pos, y_pos;
 
-  for (items = icon_list->priv->items; items; items = items->next)
-    {
-      EggIconListItem *item = items->data;
-      
-      if (x > item->x && x < item->x + item->width &&
-         y > item->y && y < item->y + item->height)
-       {
-         gint layout_x = item->x +  (item->width - item->layout_width) / 2;
-         /* Check if the mouse is inside the icon or the label */
-         if ((x > item->pixbuf_x && x < item->pixbuf_x + item->pixbuf_width &&
-              y > item->pixbuf_y && y < item->pixbuf_y + item->pixbuf_height) ||
-             (x > layout_x - ICON_TEXT_PADDING &&
-              x < layout_x + item->layout_width + ICON_TEXT_PADDING * 2 &&
-              y > item->layout_y - ICON_TEXT_PADDING
-              && y < item->layout_y + item->layout_height + ICON_TEXT_PADDING * 2))
-           return item;
-       }
-    }
+  widget = GTK_ACCESSIBLE (component)->widget;
+  if (widget == NULL)
+  /* State is defunct */
+    return NULL;
+
+  icon_view = GTK_ICON_VIEW (widget);
+  atk_component_get_extents (component, &x_pos, &y_pos, NULL, NULL, coord_type);
+  item = gtk_icon_view_get_item_at_pos (icon_view, x - x_pos, y - y_pos);
+  if (item)
+    return gtk_icon_view_accessible_ref_child (ATK_OBJECT (component), item->index);
 
   return NULL;
 }
 
-gint
-egg_icon_list_get_item_count (EggIconList *icon_list)
+static void
+atk_component_interface_init (AtkComponentIface *iface)
 {
-  g_return_val_if_fail (EGG_IS_ICON_LIST (icon_list), 0);
-
-  return icon_list->priv->item_count;
+  iface->ref_accessible_at_point = gtk_icon_view_accessible_ref_accessible_at_point;
 }
 
-void
-egg_icon_list_foreach (EggIconList           *icon_list,
-                      EggIconListForeachFunc func,
-                      gpointer               data)
+static gboolean
+gtk_icon_view_accessible_add_selection (AtkSelection *selection,
+                                        gint i)
 {
-  GList *list;
+  GtkWidget *widget;
+  GtkIconView *icon_view;
+  GtkIconViewItem *item;
+  GList *l;
+
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return FALSE;
+
+  icon_view = GTK_ICON_VIEW (widget);
 
-  for (list = icon_list->priv->items; list; list = list->next)
-    (* func) (icon_list, list->data, data);
+  l = g_list_nth (icon_view->priv->items, i);
+  if (!l)
+    return FALSE;
+
+  item = l->data;
+  gtk_icon_view_select_item (icon_view, item);
+
+  return TRUE;
 }
 
-void
-egg_icon_list_selected_foreach (EggIconList           *icon_list,
-                               EggIconListForeachFunc func,
-                               gpointer               data)
+static gboolean
+gtk_icon_view_accessible_clear_selection (AtkSelection *selection)
 {
-  GList *list;
+  GtkWidget *widget;
+  GtkIconView *icon_view;
 
-  for (list = icon_list->priv->items; list; list = list->next)
-    {
-      EggIconListItem *item = list->data;
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return FALSE;
 
-      if (item->selected)
-       (* func) (icon_list, list->data, data);
-    }
+  icon_view = GTK_ICON_VIEW (widget);
+  gtk_icon_view_unselect_all (icon_view);
+
+  return TRUE;
 }
 
-GList *
-egg_icon_list_get_selected (EggIconList  *icon_list)
+static AtkObject*
+gtk_icon_view_accessible_ref_selection (AtkSelection *selection,
+                                        gint          i)
 {
-  GList *list, *selected = NULL;
+  GtkWidget *widget;
+  GtkIconView *icon_view;
+  GtkIconViewItem *item;
+  GList *l;
 
-  g_return_val_if_fail (EGG_IS_ICON_LIST (icon_list), NULL);
-  
-  for (list = icon_list->priv->items; list; list = list->next)
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return NULL;
+
+  icon_view = GTK_ICON_VIEW (widget);
+
+  l = icon_view->priv->items;
+  while (l)
     {
-      EggIconListItem *item = list->data;
-      
+      item = l->data;
       if (item->selected)
-       selected = g_list_prepend (selected, item);
+        {
+          if (i == 0)
+           return atk_object_ref_accessible_child (gtk_widget_get_accessible (widget), item->index);
+          else
+            i--;
+        }
+      l = l->next;
     }
 
-  return g_list_reverse (selected);
+  return NULL;
 }
 
-void
-egg_icon_list_set_selection_mode (EggIconList      *icon_list,
-                                 GtkSelectionMode  mode)
+static gint
+gtk_icon_view_accessible_get_selection_count (AtkSelection *selection)
 {
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-
-  if (mode == icon_list->priv->selection_mode)
-    return;
-  
-  if (mode == GTK_SELECTION_NONE ||
-      icon_list->priv->selection_mode == GTK_SELECTION_MULTIPLE)
-    egg_icon_list_unselect_all (icon_list);
-  
-  icon_list->priv->selection_mode = mode;
-
-  g_object_notify (G_OBJECT (icon_list), "selection_mode");
-}
+  GtkWidget *widget;
+  GtkIconView *icon_view;
+  GtkIconViewItem *item;
+  GList *l;
+  gint count;
 
-GtkSelectionMode
-egg_icon_list_get_selection_mode (EggIconList *icon_list)
-{
-  g_return_val_if_fail (EGG_IS_ICON_LIST (icon_list), GTK_SELECTION_SINGLE);
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return 0;
 
-  return icon_list->priv->selection_mode;
-}
+  icon_view = GTK_ICON_VIEW (widget);
 
-void
-egg_icon_list_select_item (EggIconList      *icon_list,
-                          EggIconListItem  *item)
-{
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-  g_return_if_fail (item != NULL);
+  l = icon_view->priv->items;
+  count = 0;
+  while (l)
+    {
+      item = l->data;
 
-  if (item->selected)
-    return;
-  
-  if (icon_list->priv->selection_mode == GTK_SELECTION_NONE)
-    return;
-  else if (icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE)
-    egg_icon_list_unselect_all_internal (icon_list, FALSE);
+      if (item->selected)
+       count++;
 
-  item->selected = TRUE;
+      l = l->next;
+    }
 
-  g_signal_emit (icon_list, icon_list_signals[SELECTION_CHANGED], 0);
-  
-  egg_icon_list_queue_draw_item (icon_list, item);
+  return count;
 }
 
-
-void
-egg_icon_list_unselect_item (EggIconList      *icon_list,
-                            EggIconListItem  *item)
+static gboolean
+gtk_icon_view_accessible_is_child_selected (AtkSelection *selection,
+                                            gint          i)
 {
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-  g_return_if_fail (item != NULL);
-
-  if (!item->selected)
-    return;
-  
-  if (icon_list->priv->selection_mode == GTK_SELECTION_NONE ||
-      icon_list->priv->selection_mode == GTK_SELECTION_BROWSE)
-    return;
-  
-  item->selected = FALSE;
+  GtkWidget *widget;
+  GtkIconView *icon_view;
+  GtkIconViewItem *item;
+  GList *l;
 
-  g_signal_emit (icon_list, icon_list_signals[SELECTION_CHANGED], 0);
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return FALSE;
 
-  egg_icon_list_queue_draw_item (icon_list, item);
-}
+  icon_view = GTK_ICON_VIEW (widget);
+  l = g_list_nth (icon_view->priv->items, i);
+  if (!l)
+    return FALSE;
 
-gboolean
-egg_icon_list_item_is_selected (EggIconListItem *item)
-{
-  g_return_val_if_fail (item != NULL, FALSE);
+  item = l->data;
 
   return item->selected;
 }
 
-void
-egg_icon_list_unselect_all (EggIconList *icon_list)
+static gboolean
+gtk_icon_view_accessible_remove_selection (AtkSelection *selection,
+                                           gint          i)
 {
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-
-  egg_icon_list_unselect_all_internal (icon_list, TRUE);
-}
+  GtkWidget *widget;
+  GtkIconView *icon_view;
+  GtkIconViewItem *item;
+  GList *l;
+  gint count;
 
-void
-egg_icon_list_select_all (EggIconList *icon_list)
-{
-  GList *items;
-  gboolean dirty = FALSE;
-  
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return FALSE;
 
-  for (items = icon_list->priv->items; items; items = items->next)
+  icon_view = GTK_ICON_VIEW (widget);
+  l = icon_view->priv->items;
+  count = 0;
+  while (l)
     {
-      EggIconListItem *item = items->data;
-      
-      if (!item->selected)
-       {
-         dirty = TRUE;
-         item->selected = TRUE;
-         egg_icon_list_queue_draw_item (icon_list, item);
-       }
+      item = l->data;
+      if (item->selected)
+        {
+          if (count == i)
+            {
+              gtk_icon_view_unselect_item (icon_view, item);
+              return TRUE;
+            }
+          count++;
+        }
+      l = l->next;
     }
 
-  if (dirty)
-    g_signal_emit (icon_list, icon_list_signals[SELECTION_CHANGED], 0);
+  return FALSE;
 }
-
-void
-egg_icon_list_set_sorted (EggIconList *icon_list,
-                         gboolean     sorted)
+static gboolean
+gtk_icon_view_accessible_select_all_selection (AtkSelection *selection)
 {
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-  g_return_if_fail (icon_list->priv->sort_func != NULL);
+  GtkWidget *widget;
+  GtkIconView *icon_view;
 
-  if (icon_list->priv->sorted == sorted)
-    return;
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return FALSE;
 
-  icon_list->priv->sorted = sorted;
-  g_object_notify (G_OBJECT (icon_list), "sorted");
-  
-  if (icon_list->priv->sorted)
-    egg_icon_list_sort (icon_list);
+  icon_view = GTK_ICON_VIEW (widget);
+  gtk_icon_view_select_all (icon_view);
+  return TRUE;
 }
 
-gboolean
-egg_icon_list_get_sorted (EggIconList *icon_list)
+static void
+gtk_icon_view_accessible_selection_interface_init (AtkSelectionIface *iface)
 {
-  g_return_val_if_fail (EGG_IS_ICON_LIST (icon_list), FALSE);
-  
-  return icon_list->priv->sorted;
+  iface->add_selection = gtk_icon_view_accessible_add_selection;
+  iface->clear_selection = gtk_icon_view_accessible_clear_selection;
+  iface->ref_selection = gtk_icon_view_accessible_ref_selection;
+  iface->get_selection_count = gtk_icon_view_accessible_get_selection_count;
+  iface->is_child_selected = gtk_icon_view_accessible_is_child_selected;
+  iface->remove_selection = gtk_icon_view_accessible_remove_selection;
+  iface->select_all_selection = gtk_icon_view_accessible_select_all_selection;
 }
 
-void
-egg_icon_list_set_sort_func (EggIconList                *icon_list,
-                            EggIconListItemCompareFunc  func,
-                            gpointer                    data,
-                            GDestroyNotify              destroy_notify)
+static GType
+gtk_icon_view_accessible_get_type (void)
 {
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
-  g_return_if_fail (func != NULL);
-
-  if (icon_list->priv->sort_destroy_notify &&
-      icon_list->priv->sort_data)
-    (* icon_list->priv->sort_destroy_notify) (icon_list->priv->sort_data);
+  static GType type = 0;
 
-  icon_list->priv->sort_func = func;
-  icon_list->priv->sort_data = data;
-  icon_list->priv->sort_destroy_notify = destroy_notify;
+  if (!type)
+    {
+      static GTypeInfo tinfo =
+      {
+        0, /* class size */
+        (GBaseInitFunc) NULL, /* base init */
+        (GBaseFinalizeFunc) NULL, /* base finalize */
+        (GClassInitFunc) gtk_icon_view_accessible_class_init,
+        (GClassFinalizeFunc) NULL, /* class finalize */
+        NULL, /* class data */
+        0, /* instance size */
+        0, /* nb preallocs */
+        (GInstanceInitFunc) NULL, /* instance init */
+        NULL /* value table */
+      };
+      static const GInterfaceInfo atk_component_info =
+      {
+        (GInterfaceInitFunc) atk_component_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+      static const GInterfaceInfo atk_selection_info = 
+      {
+        (GInterfaceInitFunc) gtk_icon_view_accessible_selection_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+
+      /*
+       * Figure out the size of the class and instance
+       * we are deriving from
+       */
+      AtkObjectFactory *factory;
+      GType derived_type;
+      GTypeQuery query;
+      GType derived_atk_type;
+
+      derived_type = g_type_parent (GTK_TYPE_ICON_VIEW);
+      factory = atk_registry_get_factory (atk_get_default_registry (), 
+                                          derived_type);
+      derived_atk_type = atk_object_factory_get_accessible_type (factory);
+      g_type_query (derived_atk_type, &query);
+      tinfo.class_size = query.class_size;
+      tinfo.instance_size = query.instance_size;
+      type = g_type_register_static (derived_atk_type, 
+                                     "GtkIconViewAccessible", 
+                                     &tinfo, 0);
+      g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
+                                   &atk_component_info);
+      g_type_add_interface_static (type, ATK_TYPE_SELECTION,
+                                   &atk_selection_info);
+    }
+  return type;
 }
 
-void
-egg_icon_list_set_sort_order (EggIconList  *icon_list,
-                             GtkSortType   order)
+static AtkObject *
+gtk_icon_view_accessible_new (GObject *obj)
 {
-  g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
+  AtkObject *accessible;
 
-  if (icon_list->priv->sort_order == order)
-    return;
+  g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL);
 
-  icon_list->priv->sort_order = order;
+  accessible = g_object_new (gtk_icon_view_accessible_get_type (), NULL);
+  atk_object_initialize (accessible, obj);
 
-  if (icon_list->priv->sorted)
-    egg_icon_list_sort (icon_list);
-  
-  g_object_notify (G_OBJECT (icon_list), "sort_order");
+  return accessible;
 }
 
-GtkSortType
-egg_icon_list_get_sort_order (EggIconList  *icon_list)
+static GType
+gtk_icon_view_accessible_factory_get_accessible_type (void)
 {
-  g_return_val_if_fail (EGG_IS_ICON_LIST (icon_list), GTK_SORT_ASCENDING);
+  return gtk_icon_view_accessible_get_type ();
+}
 
-  return icon_list->priv->sort_order;
+static AtkObject*
+gtk_icon_view_accessible_factory_create_accessible (GObject *obj)
+{
+  return gtk_icon_view_accessible_new (obj);
 }
 
-void
-egg_icon_list_item_activated (EggIconList      *icon_list,
-                             EggIconListItem  *item)
+static void
+gtk_icon_view_accessible_factory_class_init (AtkObjectFactoryClass *klass)
 {
-  g_signal_emit (G_OBJECT (icon_list), icon_list_signals[ITEM_ACTIVATED], 0, item);
+  klass->create_accessible = gtk_icon_view_accessible_factory_create_accessible;
+  klass->get_accessible_type = gtk_icon_view_accessible_factory_get_accessible_type;
 }
 
-GList *
-egg_icon_list_get_items (EggIconList *icon_list)
+static GType
+gtk_icon_view_accessible_factory_get_type (void)
 {
-  g_return_val_if_fail (EGG_IS_ICON_LIST (icon_list), NULL);
+  static GType type = 0;
 
-  return icon_list->priv->items;
+  if (!type)
+    {
+      static const GTypeInfo tinfo =
+      {
+        sizeof (AtkObjectFactoryClass),
+        NULL,           /* base_init */
+        NULL,           /* base_finalize */
+        (GClassInitFunc) gtk_icon_view_accessible_factory_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data */
+        sizeof (AtkObjectFactory),
+        0,             /* n_preallocs */
+        NULL, NULL
+      };
+
+      type = g_type_register_static (ATK_TYPE_OBJECT_FACTORY, 
+                                    "GtkIconViewAccessibleFactory",
+                                    &tinfo, 0);
+    }
+  return type;
 }
 
-EggIconList *
-egg_icon_list_item_get_icon_list (EggIconListItem *item)
+static AtkObject *
+gtk_icon_view_get_accessible (GtkWidget *widget)
 {
-  g_return_val_if_fail (EGG_IS_ICON_LIST_ITEM (item), NULL);
+  static gboolean first_time = TRUE;
 
-  return item->icon_list;
+  if (first_time)
+    {
+      AtkObjectFactory *factory;
+      AtkRegistry *registry;
+      GType derived_type; 
+      GType derived_atk_type; 
+
+      /*
+       * Figure out whether accessibility is enabled by looking at the
+       * type of the accessible object which would be created for
+       * the parent type of GtkIconView.
+       */
+      derived_type = g_type_parent (GTK_TYPE_ICON_VIEW);
+
+      registry = atk_get_default_registry ();
+      factory = atk_registry_get_factory (registry,
+                                          derived_type);
+      derived_atk_type = atk_object_factory_get_accessible_type (factory);
+      if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) 
+       atk_registry_set_factory_type (registry, 
+                                      GTK_TYPE_ICON_VIEW,
+                                      gtk_icon_view_accessible_factory_get_type ());
+      first_time = FALSE;
+    } 
+  return GTK_WIDGET_CLASS (parent_class)->get_accessible (widget);
 }
+
+#define __GTK_ICON_VIEW_C__
+#include "gtkaliasdef.c"