]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkiconview.c
Change FSF Address
[~andy/gtk] / gtk / gtkiconview.c
index 03c4e5904a1273a2edcf71cb6c20650c9df50729..1e9050fe8b2bd289f14a8913ec69ac8f52133c36 100644 (file)
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 
 #include <string.h>
 
-#include <atk/atk.h>
-
-#include "gtkaccessibleprivate.h"
 #include "gtkiconview.h"
+#include "gtkiconviewprivate.h"
+
 #include "gtkcelllayout.h"
 #include "gtkcellrenderer.h"
 #include "gtkcellareabox.h"
 #include "gtkwindow.h"
 #include "gtkentry.h"
 #include "gtkcombobox.h"
-#include "gtktextbuffer.h"
 #include "gtkscrollable.h"
 #include "gtksizerequest.h"
 #include "gtktreednd.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
+#include "a11y/gtkiconviewaccessible.h"
 
 /**
  * SECTION:gtkiconview
 
 #define GTK_ICON_VIEW_PRIORITY_LAYOUT (GDK_PRIORITY_REDRAW + 5)
 
-typedef struct _GtkIconViewItem GtkIconViewItem;
-struct _GtkIconViewItem
-{
-  /* First member is always the rectangle so it 
-   * can be cast to a rectangle. */
-  GdkRectangle cell_area;
-
-  GtkTreeIter iter;
-  gint index;
-  
-  gint row, col;
-
-  guint selected : 1;
-  guint selected_before_rubberbanding : 1;
-
-};
-
 typedef struct _GtkIconViewChild GtkIconViewChild;
 struct _GtkIconViewChild
 {
@@ -94,103 +74,6 @@ struct _GtkIconViewChild
   GdkRectangle  area;
 };
 
-struct _GtkIconViewPrivate
-{
-  GtkCellArea        *cell_area;
-  GtkCellAreaContext *cell_area_context;
-
-  gulong              add_editable_id;
-  gulong              remove_editable_id;
-  gulong              context_changed_id;
-
-  GPtrArray          *row_contexts;
-
-  gint width, height;
-
-  GtkSelectionMode selection_mode;
-
-  GdkWindow *bin_window;
-
-  GList *children;
-
-  GtkTreeModel *model;
-  
-  GList *items;
-  
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-
-  guint layout_idle_id;
-  
-  gint rubberband_x1, rubberband_y1;
-  gint rubberband_x2, rubberband_y2;
-  GdkDevice *rubberband_device;
-
-  guint scroll_timeout_id;
-  gint scroll_value_diff;
-  gint event_last_x, event_last_y;
-
-  GtkIconViewItem *anchor_item;
-  GtkIconViewItem *cursor_item;
-
-  GtkIconViewItem *last_single_clicked;
-
-  GtkOrientation item_orientation;
-
-  gint columns;
-  gint item_width;
-  gint spacing;
-  gint row_spacing;
-  gint column_spacing;
-  gint margin;
-  gint item_padding;
-
-  gint text_column;
-  gint markup_column;
-  gint pixbuf_column;
-
-  GtkCellRenderer *pixbuf_cell;
-  GtkCellRenderer *text_cell;
-
-  gint tooltip_column;
-
-  /* Drag-and-drop. */
-  GdkModifierType start_button_mask;
-  gint pressed_button;
-  gint press_start_x;
-  gint press_start_y;
-
-  GdkDragAction source_actions;
-  GdkDragAction dest_actions;
-
-  GtkTreeRowReference *dest_item;
-  GtkIconViewDropPosition dest_pos;
-
-  /* scroll to */
-  GtkTreeRowReference *scroll_to_path;
-  gfloat scroll_to_row_align;
-  gfloat scroll_to_col_align;
-  guint scroll_to_use_align : 1;
-
-  guint source_set : 1;
-  guint dest_set : 1;
-  guint reorderable : 1;
-  guint empty_view_drop :1;
-
-  guint ctrl_pressed : 1;
-  guint shift_pressed : 1;
-
-  guint draw_focus : 1;
-
-  /* GtkScrollablePolicy needs to be checked when
-   * driving the scrollable adjustment values */
-  guint hscroll_policy : 1;
-  guint vscroll_policy : 1;
-
-  guint doing_rubberband : 1;
-
-};
-
 /* Signals */
 enum
 {
@@ -274,7 +157,6 @@ static gboolean         gtk_icon_view_key_press                 (GtkWidget
                                                                 GdkEventKey        *event);
 static gboolean         gtk_icon_view_key_release               (GtkWidget          *widget,
                                                                 GdkEventKey        *event);
-static AtkObject       *gtk_icon_view_get_accessible            (GtkWidget          *widget);
 
 
 /* GtkContainer vfuncs */
@@ -299,9 +181,6 @@ static void                 gtk_icon_view_set_hadjustment                (GtkIco
                                                                           GtkAdjustment          *adjustment);
 static void                 gtk_icon_view_set_vadjustment                (GtkIconView            *icon_view,
                                                                           GtkAdjustment          *adjustment);
-static void                 gtk_icon_view_accessible_set_adjustment      (AtkObject              *accessible,
-                                                                          GtkOrientation          orientation,
-                                                                          GtkAdjustment          *adjustment);
 static void                 gtk_icon_view_adjustment_changed             (GtkAdjustment          *adjustment,
                                                                          GtkIconView            *icon_view);
 static void                 gtk_icon_view_layout                         (GtkIconView            *icon_view);
@@ -318,9 +197,6 @@ static void                 gtk_icon_view_queue_draw_path                (GtkIco
 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,
-                                                                         GtkCellRenderer        *cursor_cell);
 static void                 gtk_icon_view_start_rubberbanding            (GtkIconView            *icon_view,
                                                                           GdkDevice              *device,
                                                                          gint                    x,
@@ -356,20 +232,9 @@ static void                 gtk_icon_view_move_cursor_start_end          (GtkIco
                                                                          gint                    count);
 static void                 gtk_icon_view_scroll_to_item                 (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_coords             (GtkIconView            *icon_view,
-                                                                         gint                    x,
-                                                                         gint                    y,
-                                                                         gboolean                only_in_cell,
-                                                                         GtkCellRenderer       **cell_at_pos);
-static void                 gtk_icon_view_set_cell_data                  (GtkIconView            *icon_view,
-                                                                         GtkIconViewItem        *item);
 
 static void                 gtk_icon_view_ensure_cell_area               (GtkIconView            *icon_view,
                                                                           GtkCellArea            *cell_area);
@@ -483,7 +348,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
   widget_class->realize = gtk_icon_view_realize;
   widget_class->unrealize = gtk_icon_view_unrealize;
   widget_class->style_updated = gtk_icon_view_style_updated;
-  widget_class->get_accessible = gtk_icon_view_get_accessible;
   widget_class->get_preferred_width = gtk_icon_view_get_preferred_width;
   widget_class->get_preferred_height = gtk_icon_view_get_preferred_height;
   widget_class->size_allocate = gtk_icon_view_size_allocate;
@@ -1047,6 +911,8 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                  GTK_MOVEMENT_VISUAL_POSITIONS, 1);
   gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Left, 0, 
                                  GTK_MOVEMENT_VISUAL_POSITIONS, -1);
+
+  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ICON_VIEW_ACCESSIBLE);
 }
 
 static void
@@ -1434,6 +1300,7 @@ gtk_icon_view_realize (GtkWidget *widget)
   gtk_style_context_save (context);
   gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
   gtk_style_context_set_background (context, icon_view->priv->bin_window);
+  gtk_style_context_set_background (context, window);
   gtk_style_context_restore (context);
 
   gdk_window_show (icon_view->priv->bin_window);
@@ -1589,7 +1456,7 @@ gtk_icon_view_draw (GtkWidget *widget,
   cairo_save (cr);
 
   gtk_cairo_transform_to_window (cr, widget, icon_view->priv->bin_window);
-      
+
   cairo_set_line_width (cr, 1.);
 
   gtk_icon_view_get_drag_dest_item (icon_view, &path, &dest_pos);
@@ -1602,7 +1469,7 @@ gtk_icon_view_draw (GtkWidget *widget,
   else
     dest_index = -1;
 
-  for (icons = icon_view->priv->items; icons; icons = icons->next) 
+  for (icons = icon_view->priv->items; icons; icons = icons->next)
     {
       GtkIconViewItem *item = icons->data;
       GdkRectangle paint_area;
@@ -1621,8 +1488,8 @@ gtk_icon_view_draw (GtkWidget *widget,
         {
           gtk_icon_view_paint_item (icon_view, cr, item,
                                     ((GdkRectangle *)item)->x, ((GdkRectangle *)item)->y,
-                                    icon_view->priv->draw_focus); 
-     
+                                    icon_view->priv->draw_focus);
+
           if (dest_index == item->index)
             dest_item = item;
         }
@@ -1634,11 +1501,9 @@ gtk_icon_view_draw (GtkWidget *widget,
       dest_pos != GTK_ICON_VIEW_NO_DROP)
     {
       GtkStyleContext *context;
-      GtkStateFlags state;
       GdkRectangle rect = { 0 };
 
       context = gtk_widget_get_style_context (widget);
-      state = gtk_widget_get_state_flags (widget);
 
       switch (dest_pos)
        {
@@ -1672,20 +1537,17 @@ gtk_icon_view_draw (GtkWidget *widget,
          break;
         }
 
-      gtk_style_context_set_state (context, state);
       gtk_render_focus (context, cr,
                         rect.x, rect.y,
                         rect.width, rect.height);
     }
-  
+
   if (icon_view->priv->doing_rubberband)
     gtk_icon_view_paint_rubberband (icon_view, cr);
 
   cairo_restore (cr);
 
-  GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->draw (widget, cr);
-
-  return TRUE;
+  return GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->draw (widget, cr);
 }
 
 static gboolean
@@ -1742,6 +1604,33 @@ gtk_icon_view_motion (GtkWidget      *widget,
       else 
        remove_scroll_timeout (icon_view);
     }
+  else
+    {
+      GtkIconViewItem *item, *last_prelight_item;
+      GtkCellRenderer *cell = NULL;
+
+      last_prelight_item = icon_view->priv->last_prelight;
+      item = _gtk_icon_view_get_item_at_coords (icon_view,
+                                               event->x, event->y,
+                                               FALSE,
+                                               &cell);
+
+      if (item != NULL)
+        {
+          item->prelight = TRUE;
+          gtk_icon_view_queue_draw_item (icon_view, item);
+        }
+
+      if (last_prelight_item != NULL &&
+          last_prelight_item != item)
+        {
+          last_prelight_item->prelight = FALSE;
+          gtk_icon_view_queue_draw_item (icon_view,
+                                         icon_view->priv->last_prelight);
+        }
+
+      icon_view->priv->last_prelight = item;
+    }
   
   return TRUE;
 }
@@ -1914,7 +1803,7 @@ gtk_icon_view_set_cursor (GtkIconView     *icon_view,
   if (!item)
     return;
   
-  gtk_icon_view_set_cursor_item (icon_view, item, cell);
+  _gtk_icon_view_set_cursor_item (icon_view, item, cell);
   gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.0, 0.0);
 
   if (start_editing && 
@@ -1923,7 +1812,7 @@ gtk_icon_view_set_cursor (GtkIconView     *icon_view,
       GtkCellAreaContext *context;
 
       context = g_ptr_array_index (icon_view->priv->row_contexts, item->row);
-      gtk_icon_view_set_cell_data (icon_view, item);
+      _gtk_icon_view_set_cell_data (icon_view, item);
       gtk_cell_area_activate (icon_view->priv->cell_area, context, 
                              GTK_WIDGET (icon_view), (GdkRectangle *)item, 
                              0 /* XXX flags */, TRUE);
@@ -1989,9 +1878,18 @@ gtk_icon_view_button_press (GtkWidget      *widget,
   if (!gtk_widget_has_focus (widget))
     gtk_widget_grab_focus (widget);
 
-  if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
+  if (event->button == GDK_BUTTON_PRIMARY && event->type == GDK_BUTTON_PRESS)
     {
-      item = gtk_icon_view_get_item_at_coords (icon_view, 
+      GdkModifierType extend_mod_mask;
+      GdkModifierType modify_mod_mask;
+
+      extend_mod_mask =
+        gtk_widget_get_modifier_mask (widget, GDK_MODIFIER_INTENT_EXTEND_SELECTION);
+
+      modify_mod_mask =
+        gtk_widget_get_modifier_mask (widget, GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+
+      item = _gtk_icon_view_get_item_at_coords (icon_view, 
                                               event->x, event->y,
                                               FALSE,
                                               &cell);
@@ -2013,14 +1911,14 @@ gtk_icon_view_button_press (GtkWidget      *widget,
          
          if (icon_view->priv->selection_mode == GTK_SELECTION_NONE)
            {
-             gtk_icon_view_set_cursor_item (icon_view, item, cursor_cell);
+             _gtk_icon_view_set_cursor_item (icon_view, item, cursor_cell);
            }
          else if (icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE &&
-                  (event->state & GDK_SHIFT_MASK))
+                  (event->state & extend_mod_mask))
            {
              gtk_icon_view_unselect_all_internal (icon_view);
 
-             gtk_icon_view_set_cursor_item (icon_view, item, cursor_cell);
+             _gtk_icon_view_set_cursor_item (icon_view, item, cursor_cell);
              if (!icon_view->priv->anchor_item)
                icon_view->priv->anchor_item = item;
              else 
@@ -2033,7 +1931,7 @@ gtk_icon_view_button_press (GtkWidget      *widget,
            {
              if ((icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE ||
                  ((icon_view->priv->selection_mode == GTK_SELECTION_SINGLE) && item->selected)) &&
-                 (event->state & GDK_CONTROL_MASK))
+                 (event->state & modify_mod_mask))
                {
                  item->selected = !item->selected;
                  gtk_icon_view_queue_draw_item (icon_view, item);
@@ -2047,7 +1945,7 @@ gtk_icon_view_button_press (GtkWidget      *widget,
                  gtk_icon_view_queue_draw_item (icon_view, item);
                  dirty = TRUE;
                }
-             gtk_icon_view_set_cursor_item (icon_view, item, cursor_cell);
+             _gtk_icon_view_set_cursor_item (icon_view, item, cursor_cell);
              icon_view->priv->anchor_item = item;
            }
 
@@ -2071,7 +1969,7 @@ gtk_icon_view_button_press (GtkWidget      *widget,
 
              context = g_ptr_array_index (icon_view->priv->row_contexts, item->row);
 
-             gtk_icon_view_set_cell_data (icon_view, item);
+             _gtk_icon_view_set_cell_data (icon_view, item);
              gtk_cell_area_activate (icon_view->priv->cell_area, context,
                                      GTK_WIDGET (icon_view),
                                      (GdkRectangle *)item, 0/* XXX flags */, FALSE);
@@ -2080,7 +1978,7 @@ gtk_icon_view_button_press (GtkWidget      *widget,
       else
        {
          if (icon_view->priv->selection_mode != GTK_SELECTION_BROWSE &&
-             !(event->state & GDK_CONTROL_MASK))
+             !(event->state & modify_mod_mask))
            {
              dirty = gtk_icon_view_unselect_all_internal (icon_view);
            }
@@ -2093,9 +1991,9 @@ gtk_icon_view_button_press (GtkWidget      *widget,
       icon_view->priv->draw_focus = FALSE;
     }
 
-  if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
+  if (event->button == GDK_BUTTON_PRIMARY && event->type == GDK_2BUTTON_PRESS)
     {
-      item = gtk_icon_view_get_item_at_coords (icon_view,
+      item = _gtk_icon_view_get_item_at_coords (icon_view,
                                               event->x, event->y,
                                               FALSE,
                                               NULL);
@@ -2116,7 +2014,7 @@ gtk_icon_view_button_press (GtkWidget      *widget,
   if (dirty)
     g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
 
-  return event->button == 1;
+  return event->button == GDK_BUTTON_PRIMARY;
 }
 
 static gboolean
@@ -2351,7 +2249,7 @@ gtk_icon_view_item_hit_test (GtkIconView      *icon_view,
 
   context = g_ptr_array_index (icon_view->priv->row_contexts, item->row);
 
-  gtk_icon_view_set_cell_data (icon_view, item);
+  _gtk_icon_view_set_cell_data (icon_view, item);
   gtk_cell_area_foreach_alloc (icon_view->priv->cell_area, context,
                               GTK_WIDGET (icon_view),
                               item_area, item_area,
@@ -2405,7 +2303,7 @@ 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);
+    _gtk_icon_view_select_item (icon_view, icon_view->priv->cursor_item);
 }
 
 static gboolean
@@ -2419,7 +2317,7 @@ gtk_icon_view_real_activate_cursor_item (GtkIconView *icon_view)
 
   context = g_ptr_array_index (icon_view->priv->row_contexts, icon_view->priv->cursor_item->row);
 
-  gtk_icon_view_set_cell_data (icon_view, icon_view->priv->cursor_item);
+  _gtk_icon_view_set_cell_data (icon_view, icon_view->priv->cursor_item);
   gtk_cell_area_activate (icon_view->priv->cell_area, context,
                           GTK_WIDGET (icon_view),
                           (GdkRectangle *)icon_view->priv->cursor_item,
@@ -2444,13 +2342,13 @@ gtk_icon_view_real_toggle_cursor_item (GtkIconView *icon_view)
     case GTK_SELECTION_NONE:
       break;
     case GTK_SELECTION_BROWSE:
-      gtk_icon_view_select_item (icon_view, icon_view->priv->cursor_item);
+      _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);
+       _gtk_icon_view_unselect_item (icon_view, icon_view->priv->cursor_item);
       else
-       gtk_icon_view_select_item (icon_view, icon_view->priv->cursor_item);
+       _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;
@@ -2544,7 +2442,6 @@ gtk_icon_view_set_hadjustment (GtkIconView   *icon_view,
                                GtkAdjustment *adjustment)
 {
   GtkIconViewPrivate *priv = icon_view->priv;
-  AtkObject *atk_obj;
 
   if (adjustment && priv->hadjustment == adjustment)
     return;
@@ -2566,11 +2463,6 @@ gtk_icon_view_set_hadjustment (GtkIconView   *icon_view,
   priv->hadjustment = g_object_ref_sink (adjustment);
   gtk_icon_view_set_hadjustment_values (icon_view);
 
-  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
-  gtk_icon_view_accessible_set_adjustment (atk_obj,
-                                           GTK_ORIENTATION_HORIZONTAL,
-                                           adjustment);
-
   g_object_notify (G_OBJECT (icon_view), "hadjustment");
 }
 
@@ -2579,7 +2471,6 @@ gtk_icon_view_set_vadjustment (GtkIconView   *icon_view,
                                GtkAdjustment *adjustment)
 {
   GtkIconViewPrivate *priv = icon_view->priv;
-  AtkObject *atk_obj;
 
   if (adjustment && priv->vadjustment == adjustment)
     return;
@@ -2601,11 +2492,6 @@ gtk_icon_view_set_vadjustment (GtkIconView   *icon_view,
   priv->vadjustment = g_object_ref_sink (adjustment);
   gtk_icon_view_set_vadjustment_values (icon_view);
 
-  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
-  gtk_icon_view_accessible_set_adjustment (atk_obj,
-                                           GTK_ORIENTATION_VERTICAL,
-                                           adjustment);
-
   g_object_notify (G_OBJECT (icon_view), "vadjustment");
 }
 
@@ -2623,6 +2509,8 @@ gtk_icon_view_adjustment_changed (GtkAdjustment *adjustment,
 
       if (icon_view->priv->doing_rubberband)
         gtk_icon_view_update_rubberband (GTK_WIDGET (icon_view));
+      
+      _gtk_icon_view_accessible_adjustment_changed (icon_view);
 
       gtk_icon_view_process_updates (icon_view);
     }
@@ -2681,7 +2569,7 @@ gtk_icon_view_layout_single_row (GtkIconView *icon_view,
        }
 
       /* Get this item's particular width & height (all alignments are cached by now) */
-      gtk_icon_view_set_cell_data (icon_view, item);
+      _gtk_icon_view_set_cell_data (icon_view, item);
       gtk_cell_area_get_preferred_height_for_width (priv->cell_area,
                                                    context,
                                                    widget, item_width, 
@@ -2744,7 +2632,7 @@ adjust_wrap_width (GtkIconView *icon_view)
        * of the time */
       if (icon_view->priv->items && icon_view->priv->pixbuf_cell)
        {
-         gtk_icon_view_set_cell_data (icon_view, icon_view->priv->items->data);
+         _gtk_icon_view_set_cell_data (icon_view, icon_view->priv->items->data);
          gtk_cell_renderer_get_preferred_width (icon_view->priv->pixbuf_cell,
                                                 GTK_WIDGET (icon_view),
                                                 &wrap_width, NULL);
@@ -2872,7 +2760,7 @@ gtk_icon_view_cache_widths (GtkIconView *icon_view)
       /* Only fetch the width of items with invalidated sizes */
       if (item->cell_area.width < 0)
        {
-         gtk_icon_view_set_cell_data (icon_view, item);
+         _gtk_icon_view_set_cell_data (icon_view, item);
          gtk_cell_area_get_preferred_width (icon_view->priv->cell_area, 
                                             icon_view->priv->cell_area_context,
                                             GTK_WIDGET (icon_view), NULL, NULL);
@@ -2930,32 +2818,49 @@ gtk_icon_view_paint_item (GtkIconView     *icon_view,
   if (priv->model == NULL)
     return;
 
-  gtk_icon_view_set_cell_data (icon_view, item);
+  _gtk_icon_view_set_cell_data (icon_view, item);
 
   style_context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
 
   gtk_style_context_save (style_context);
   gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_VIEW);
   gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_CELL);
 
+  state &= ~(GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_PRELIGHT);
+
   if (item->selected)
     {
-      if (gtk_widget_has_focus (widget) &&
+      if ((state & GTK_STATE_FLAG_FOCUSED) &&
           item == icon_view->priv->cursor_item)
         {
-          state |= GTK_STATE_FLAG_FOCUSED;
           flags |= GTK_CELL_RENDERER_FOCUSED;
         }
 
       state |= GTK_STATE_FLAG_SELECTED;
       flags |= GTK_CELL_RENDERER_SELECTED;
+    }
+
+  if (item->prelight)
+    {
+      state |= GTK_STATE_FLAG_PRELIGHT;
+      flags |= GTK_CELL_RENDERER_PRELIT;
+    }
+
+  gtk_style_context_set_state (style_context, state);
 
-      gtk_style_context_set_state (style_context, state);
+  if (item->selected)
+    {
       gtk_render_background (style_context, cr,
                              x - icon_view->priv->item_padding,
                              y - icon_view->priv->item_padding,
                              item->cell_area.width  + icon_view->priv->item_padding * 2,
                              item->cell_area.height + icon_view->priv->item_padding * 2);
+      gtk_render_frame (style_context, cr,
+                        x - icon_view->priv->item_padding,
+                        y - icon_view->priv->item_padding,
+                        item->cell_area.width  + icon_view->priv->item_padding * 2,
+                        item->cell_area.height + icon_view->priv->item_padding * 2);
     }
 
   cell_area.x      = x;
@@ -3066,10 +2971,10 @@ gtk_icon_view_queue_layout (GtkIconView *icon_view)
                                  layout_callback, icon_view, NULL);
 }
 
-static void
-gtk_icon_view_set_cursor_item (GtkIconView     *icon_view,
-                              GtkIconViewItem *item,
-                              GtkCellRenderer *cursor_cell)
+void
+_gtk_icon_view_set_cursor_item (GtkIconView     *icon_view,
+                                GtkIconViewItem *item,
+                                GtkCellRenderer *cursor_cell)
 {
   AtkObject *obj;
   AtkObject *item_obj;
@@ -3141,12 +3046,12 @@ gtk_icon_view_item_free (GtkIconViewItem *item)
   g_slice_free (GtkIconViewItem, item);
 }
 
-static GtkIconViewItem *
-gtk_icon_view_get_item_at_coords (GtkIconView          *icon_view,
-                                 gint                  x,
-                                 gint                  y,
-                                 gboolean              only_in_cell,
-                                 GtkCellRenderer     **cell_at_pos)
+GtkIconViewItem *
+_gtk_icon_view_get_item_at_coords (GtkIconView          *icon_view,
+                                   gint                  x,
+                                   gint                  y,
+                                   gboolean              only_in_cell,
+                                   GtkCellRenderer     **cell_at_pos)
 {
   GList *items;
 
@@ -3169,7 +3074,7 @@ gtk_icon_view_get_item_at_coords (GtkIconView          *icon_view,
              GtkCellAreaContext *context;
 
              context = g_ptr_array_index (icon_view->priv->row_contexts, item->row);
-             gtk_icon_view_set_cell_data (icon_view, item);
+             _gtk_icon_view_set_cell_data (icon_view, item);
 
              if (x >= item_area->x && x <= item_area->x + item_area->width &&
                  y >= item_area->y && y <= item_area->y + item_area->height)
@@ -3192,9 +3097,9 @@ gtk_icon_view_get_item_at_coords (GtkIconView          *icon_view,
   return NULL;
 }
 
-static void
-gtk_icon_view_select_item (GtkIconView      *icon_view,
-                          GtkIconViewItem  *item)
+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);
@@ -3216,9 +3121,9 @@ gtk_icon_view_select_item (GtkIconView      *icon_view,
 }
 
 
-static void
-gtk_icon_view_unselect_item (GtkIconView      *icon_view,
-                            GtkIconViewItem  *item)
+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);
@@ -3364,6 +3269,9 @@ gtk_icon_view_row_deleted (GtkTreeModel *model,
   if (item == icon_view->priv->cursor_item)
     icon_view->priv->cursor_item = NULL;
 
+  if (item == icon_view->priv->last_prelight)
+    icon_view->priv->last_prelight = NULL;
+
   if (item->selected)
     emit = TRUE;
   
@@ -3521,10 +3429,20 @@ gtk_icon_view_real_move_cursor (GtkIconView     *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;
+      GdkModifierType extend_mod_mask;
+      GdkModifierType modify_mod_mask;
+
+      extend_mod_mask =
+        gtk_widget_get_modifier_mask (GTK_WIDGET (icon_view),
+                                      GDK_MODIFIER_INTENT_EXTEND_SELECTION);
+      modify_mod_mask =
+        gtk_widget_get_modifier_mask (GTK_WIDGET (icon_view),
+                                      GDK_MODIFIER_INTENT_MODIFY_SELECTION);
+
+      if ((state & modify_mod_mask) == modify_mod_mask)
+        icon_view->priv->modify_selection_pressed = TRUE;
+      if ((state & extend_mod_mask) == extend_mod_mask)
+        icon_view->priv->extend_selection_pressed = TRUE;
     }
   /* else we assume not pressed */
 
@@ -3547,8 +3465,8 @@ gtk_icon_view_real_move_cursor (GtkIconView     *icon_view,
       g_assert_not_reached ();
     }
 
-  icon_view->priv->ctrl_pressed = FALSE;
-  icon_view->priv->shift_pressed = FALSE;
+  icon_view->priv->modify_selection_pressed = FALSE;
+  icon_view->priv->extend_selection_pressed = FALSE;
 
   icon_view->priv->draw_focus = TRUE;
 
@@ -3686,7 +3604,7 @@ gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view,
                                   gint         count)
 {
   GtkIconViewItem *item;
-  GtkCellRenderer *cell;
+  GtkCellRenderer *cell = NULL;
   gboolean dirty = FALSE;
   gint step;
   GtkDirectionType direction;
@@ -3705,11 +3623,18 @@ gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view,
       else
        list = g_list_last (icon_view->priv->items);
 
-      item = list ? list->data : NULL;
+      if (list)
+        {
+          item = list->data;
 
-      /* Give focus to the first cell initially */
-      gtk_icon_view_set_cell_data (icon_view, item);
-      gtk_cell_area_focus (icon_view->priv->cell_area, direction);
+          /* Give focus to the first cell initially */
+          _gtk_icon_view_set_cell_data (icon_view, item);
+          gtk_cell_area_focus (icon_view->priv->cell_area, direction);
+        }
+      else
+        {
+          item = NULL;
+        }
     }
   else
     {
@@ -3721,7 +3646,7 @@ gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view,
 
       while (item)
        {
-         gtk_icon_view_set_cell_data (icon_view, item);
+         _gtk_icon_view_set_cell_data (icon_view, item);
 
          if (gtk_cell_area_focus (icon_view->priv->cell_area, direction))
            break;
@@ -3747,16 +3672,16 @@ gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view,
       return;
     }
 
-  if (icon_view->priv->ctrl_pressed ||
-      !icon_view->priv->shift_pressed ||
+  if (icon_view->priv->modify_selection_pressed ||
+      !icon_view->priv->extend_selection_pressed ||
       !icon_view->priv->anchor_item ||
       icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
     icon_view->priv->anchor_item = item;
 
   cell = gtk_cell_area_get_focus_cell (icon_view->priv->cell_area);
-  gtk_icon_view_set_cursor_item (icon_view, item, cell);
+  _gtk_icon_view_set_cursor_item (icon_view, item, cell);
 
-  if (!icon_view->priv->ctrl_pressed &&
+  if (!icon_view->priv->modify_selection_pressed &&
       icon_view->priv->selection_mode != GTK_SELECTION_NONE)
     {
       dirty = gtk_icon_view_unselect_all_internal (icon_view);
@@ -3803,15 +3728,15 @@ gtk_icon_view_move_cursor_page_up_down (GtkIconView *icon_view,
   if (!item)
     return;
 
-  if (icon_view->priv->ctrl_pressed ||
-      !icon_view->priv->shift_pressed ||
+  if (icon_view->priv->modify_selection_pressed ||
+      !icon_view->priv->extend_selection_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, NULL);
+  _gtk_icon_view_set_cursor_item (icon_view, item, NULL);
 
-  if (!icon_view->priv->ctrl_pressed &&
+  if (!icon_view->priv->modify_selection_pressed &&
       icon_view->priv->selection_mode != GTK_SELECTION_NONE)
     {
       dirty = gtk_icon_view_unselect_all_internal (icon_view);
@@ -3850,11 +3775,18 @@ gtk_icon_view_move_cursor_left_right (GtkIconView *icon_view,
       else
        list = g_list_last (icon_view->priv->items);
 
-      item = list ? list->data : NULL;
+      if (list)
+        {
+          item = list->data;
 
-      /* Give focus to the first cell initially */
-      gtk_icon_view_set_cell_data (icon_view, item);
-      gtk_cell_area_focus (icon_view->priv->cell_area, direction);
+          /* Give focus to the first cell initially */
+          _gtk_icon_view_set_cell_data (icon_view, item);
+          gtk_cell_area_focus (icon_view->priv->cell_area, direction);
+        }
+      else
+        {
+          item = NULL;
+        }
     }
   else
     {
@@ -3866,7 +3798,7 @@ gtk_icon_view_move_cursor_left_right (GtkIconView *icon_view,
 
       while (item)
        {
-         gtk_icon_view_set_cell_data (icon_view, item);
+         _gtk_icon_view_set_cell_data (icon_view, item);
 
          if (gtk_cell_area_focus (icon_view->priv->cell_area, direction))
            break;
@@ -3892,16 +3824,16 @@ gtk_icon_view_move_cursor_left_right (GtkIconView *icon_view,
       return;
     }
 
-  if (icon_view->priv->ctrl_pressed ||
-      !icon_view->priv->shift_pressed ||
+  if (icon_view->priv->modify_selection_pressed ||
+      !icon_view->priv->extend_selection_pressed ||
       !icon_view->priv->anchor_item ||
       icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
     icon_view->priv->anchor_item = item;
 
   cell = gtk_cell_area_get_focus_cell (icon_view->priv->cell_area);
-  gtk_icon_view_set_cursor_item (icon_view, item, cell);
+  _gtk_icon_view_set_cursor_item (icon_view, item, cell);
 
-  if (!icon_view->priv->ctrl_pressed &&
+  if (!icon_view->priv->modify_selection_pressed &&
       icon_view->priv->selection_mode != GTK_SELECTION_NONE)
     {
       dirty = gtk_icon_view_unselect_all_internal (icon_view);
@@ -3940,15 +3872,15 @@ gtk_icon_view_move_cursor_start_end (GtkIconView *icon_view,
   if (!item)
     return;
 
-  if (icon_view->priv->ctrl_pressed ||
-      !icon_view->priv->shift_pressed ||
+  if (icon_view->priv->modify_selection_pressed ||
+      !icon_view->priv->extend_selection_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, NULL);
+  _gtk_icon_view_set_cursor_item (icon_view, item, NULL);
 
-  if (!icon_view->priv->ctrl_pressed &&
+  if (!icon_view->priv->modify_selection_pressed &&
       icon_view->priv->selection_mode != GTK_SELECTION_NONE)
     {
       dirty = gtk_icon_view_unselect_all_internal (icon_view);
@@ -4155,9 +4087,9 @@ gtk_icon_view_cell_layout_get_area (GtkCellLayout *cell_layout)
   return icon_view->priv->cell_area;
 }
 
-static void
-gtk_icon_view_set_cell_data (GtkIconView     *icon_view,
-                            GtkIconViewItem *item)
+void
+_gtk_icon_view_set_cell_data (GtkIconView     *icon_view,
+                             GtkIconViewItem *item)
 {
   gboolean iters_persist;
   GtkTreeIter iter;
@@ -4296,7 +4228,7 @@ gtk_icon_view_get_path_at_pos (GtkIconView *icon_view,
   
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), NULL);
 
-  item = gtk_icon_view_get_item_at_coords (icon_view, x, y, TRUE, NULL);
+  item = _gtk_icon_view_get_item_at_coords (icon_view, x, y, TRUE, NULL);
 
   if (!item)
     return NULL;
@@ -4338,7 +4270,7 @@ gtk_icon_view_get_item_at_pos (GtkIconView      *icon_view,
   
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), FALSE);
 
-  item = gtk_icon_view_get_item_at_coords (icon_view, x, y, TRUE, &renderer);
+  item = _gtk_icon_view_get_item_at_coords (icon_view, x, y, TRUE, &renderer);
 
   if (path != NULL)
     {
@@ -4417,7 +4349,7 @@ gtk_icon_view_set_tooltip_cell (GtkIconView     *icon_view,
       GtkCellAreaContext *context;
 
       context = g_ptr_array_index (icon_view->priv->row_contexts, item->row);
-      gtk_icon_view_set_cell_data (icon_view, item);
+      _gtk_icon_view_set_cell_data (icon_view, item);
       gtk_cell_area_get_cell_allocation (icon_view->priv->cell_area, context,
                                         GTK_WIDGET (icon_view),
                                         cell, (GdkRectangle *)item, &rect);
@@ -4561,7 +4493,7 @@ gtk_icon_view_set_tooltip_query_cb (GtkWidget  *widget,
  * for you. @column should be set to the column in @icon_view's model
  * containing the tooltip texts, or -1 to disable this feature.
  *
- * When enabled, #GtkWidget::has-tooltip will be set to %TRUE and
+ * When enabled, #GtkWidget:has-tooltip will be set to %TRUE and
  * @icon_view will connect a #GtkWidget::query-tooltip signal handler.
  *
  * Note that the signal handler sets the text with gtk_tooltip_set_markup(),
@@ -4835,12 +4767,12 @@ gtk_icon_view_set_model (GtkIconView *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);
+      g_list_free_full (icon_view->priv->items, (GDestroyNotify) gtk_icon_view_item_free);
       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->last_prelight = NULL;
       icon_view->priv->width = 0;
       icon_view->priv->height = 0;
     }
@@ -4869,7 +4801,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
 
       gtk_icon_view_build_items (icon_view);
 
-      gtk_icon_view_queue_layout (icon_view);
+      gtk_icon_view_layout (icon_view);
     }
 
   g_object_notify (G_OBJECT (icon_view), "model");  
@@ -5204,7 +5136,7 @@ gtk_icon_view_select_path (GtkIconView *icon_view,
                            gtk_tree_path_get_indices(path)[0]);
 
   if (item)
-    gtk_icon_view_select_item (icon_view, item);
+    _gtk_icon_view_select_item (icon_view, item);
 }
 
 /**
@@ -5232,7 +5164,7 @@ gtk_icon_view_unselect_path (GtkIconView *icon_view,
   if (!item)
     return;
   
-  gtk_icon_view_unselect_item (icon_view, item);
+  _gtk_icon_view_unselect_item (icon_view, item);
 }
 
 /**
@@ -5246,8 +5178,7 @@ gtk_icon_view_unselect_path (GtkIconView *icon_view,
  *
  * To free the return value, use:
  * |[
- * g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL);
- * g_list_free (list);
+ * g_list_free_full (list, (GDestroyNotify) gtk_tree_patch_free);
  * ]|
  *
  * Return value: (element-type GtkTreePath) (transfer full): A #GList containing a #GtkTreePath for each selected row.
@@ -6009,7 +5940,8 @@ remove_scroll_timeout (GtkIconView *icon_view)
 }
 
 static void
-gtk_icon_view_autoscroll (GtkIconView *icon_view)
+gtk_icon_view_autoscroll (GtkIconView *icon_view,
+                          GdkDevice   *device)
 {
   GdkWindow *window;
   gint px, py, x, y, width, height;
@@ -6017,7 +5949,7 @@ gtk_icon_view_autoscroll (GtkIconView *icon_view)
 
   window = gtk_widget_get_window (GTK_WIDGET (icon_view));
 
-  gdk_window_get_pointer (window, &px, &py, NULL);
+  gdk_window_get_device_position (window, device, &px, &py, NULL);
   gdk_window_get_geometry (window, &x, &y, &width, &height);
 
   /* see if we are near the edge. */
@@ -6038,17 +5970,26 @@ gtk_icon_view_autoscroll (GtkIconView *icon_view)
                               gtk_adjustment_get_value (icon_view->priv->hadjustment) + hoffset);
 }
 
+typedef struct {
+  GtkIconView *icon_view;
+  GdkDevice   *device;
+} DragScrollData;
 
 static gboolean
-drag_scroll_timeout (gpointer data)
+drag_scroll_timeout (gpointer datap)
 {
-  GtkIconView *icon_view = GTK_ICON_VIEW (data);
+  DragScrollData *data = datap;
 
-  gtk_icon_view_autoscroll (icon_view);
+  gtk_icon_view_autoscroll (data->icon_view, data->device);
 
   return TRUE;
 }
 
+static void
+drag_scroll_data_free (DragScrollData *data)
+{
+  g_slice_free (DragScrollData, data);
+}
 
 static gboolean
 set_destination (GtkIconView    *icon_view,
@@ -6285,7 +6226,7 @@ gtk_icon_view_drag_begin (GtkWidget      *widget,
   if (!icon_view->priv->dest_set && !icon_view->priv->source_set)
     return;
 
-  item = gtk_icon_view_get_item_at_coords (icon_view,
+  item = _gtk_icon_view_get_item_at_coords (icon_view,
                                           icon_view->priv->press_start_x,
                                           icon_view->priv->press_start_y,
                                           TRUE,
@@ -6441,8 +6382,12 @@ gtk_icon_view_drag_motion (GtkWidget      *widget,
     {
       if (icon_view->priv->scroll_timeout_id == 0)
        {
+          DragScrollData *data = g_slice_new (DragScrollData);
+          data->icon_view = icon_view;
+          data->device = gdk_drag_context_get_device (context);
+
          icon_view->priv->scroll_timeout_id =
-           gdk_threads_add_timeout (50, drag_scroll_timeout, icon_view);
+           gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT, 50, drag_scroll_timeout, data, (GDestroyNotify) drag_scroll_data_free);
        }
 
       if (target == gdk_atom_intern_static_string ("GTK_TREE_MODEL_ROW"))
@@ -6846,7 +6791,7 @@ gtk_icon_view_get_dest_item_at_pos (GtkIconView              *icon_view,
   if (path)
     *path = NULL;
 
-  item = gtk_icon_view_get_item_at_coords (icon_view, 
+  item = _gtk_icon_view_get_item_at_coords (icon_view, 
                                           drag_x + gtk_adjustment_get_value (icon_view->priv->hadjustment), 
                                           drag_y + gtk_adjustment_get_value (icon_view->priv->vadjustment),
                                           FALSE, NULL);
@@ -7034,2340 +6979,31 @@ gtk_icon_view_set_reorderable (GtkIconView *icon_view,
   g_object_notify (G_OBJECT (icon_view), "reorderable");
 }
 
-
-/* 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;
-
-  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);
-    }
-
-  return FALSE;
-}
-
-static gboolean
-gtk_icon_view_item_accessible_action_do_action (AtkAction *action,
-                                                gint       i)
-{
-  GtkIconViewItemAccessible *item;
-
-  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;
-
-  switch (i)
-    {
-    case ACTION_ACTIVATE:
-      if (!item->action_idle_handler)
-        item->action_idle_handler = gdk_threads_add_idle (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);
-
-  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 (description);
-
-  return TRUE;
-}
-
-typedef struct {
-  GdkRectangle box;
-  gboolean     pixbuf_found;
-} GetPixbufBoxData;
-
-static gboolean 
-get_pixbuf_foreach (GtkCellRenderer    *renderer,
-                   const GdkRectangle *cell_area,
-                   const GdkRectangle *cell_background,
-                   GetPixbufBoxData   *data)
-{
-  if (GTK_IS_CELL_RENDERER_PIXBUF (renderer))
-    {
-      data->box = *cell_area;
-      data->pixbuf_found = TRUE;
-    }
-  return (data->pixbuf_found != FALSE);
-}
-
-static gboolean
-get_pixbuf_box (GtkIconView     *icon_view,
-               GtkIconViewItem *item,
-               GdkRectangle    *box)
-{
-  GetPixbufBoxData data = { { 0, }, FALSE };
-  GtkCellAreaContext *context;
-
-  context = g_ptr_array_index (icon_view->priv->row_contexts, item->row);
-
-  gtk_icon_view_set_cell_data (icon_view, item);
-  gtk_cell_area_foreach_alloc (icon_view->priv->cell_area, context,
-                              GTK_WIDGET (icon_view),
-                              (GdkRectangle *)item, (GdkRectangle *)item,
-                              (GtkCellAllocCallback)get_pixbuf_foreach, &data);
-
-  return data.pixbuf_found;
-}
-
-static gboolean 
-get_text_foreach (GtkCellRenderer    *renderer,
-                 gchar             **text)
-{
-  if (GTK_IS_CELL_RENDERER_TEXT (renderer))
-    {
-      g_object_get (renderer, "text", text, NULL);
-
-      return TRUE;
-    }
-  return FALSE;
-}
-
-static gchar *
-get_text (GtkIconView     *icon_view,
-         GtkIconViewItem *item)
-{
-  gchar *text = NULL;
-
-  gtk_icon_view_set_cell_data (icon_view, item);
-  gtk_cell_area_foreach (icon_view->priv->cell_area,
-                        (GtkCellCallback)get_text_foreach, &text);
-
-  return text;
-}
-
-static void
-gtk_icon_view_item_accessible_image_get_image_size (AtkImage *image,
-                                                    gint     *width,
-                                                    gint     *height)
-{
-  GtkIconViewItemAccessible *item;
-  GdkRectangle box;
-
-  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;
-
-  if (get_pixbuf_box (GTK_ICON_VIEW (item->widget), item->item, &box))
-    {
-      *width = box.width;
-      *height = box.height;  
-    }
-}
-
-static void
-gtk_icon_view_item_accessible_image_get_image_position (AtkImage    *image,
-                                                        gint        *x,
-                                                        gint        *y,
-                                                        AtkCoordType coord_type)
-{
-  GtkIconViewItemAccessible *item;
-  GdkRectangle box;
-
-  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);
-
-  if (get_pixbuf_box (GTK_ICON_VIEW (item->widget), item->item, &box))
-    {
-      *x+= box.x - item->item->cell_area.x;
-      *y+= box.y - item->item->cell_area.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;
-}
-
-#if 0
-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_readonly (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_readonly (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_readonly (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_readonly (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);
-}
-#endif
-
-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;
-#if 0
-  GtkIconView *icon_view;
-#endif
-
-  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:
-#if 0
-      icon_view = GTK_ICON_VIEW (item->widget);
-      /* FIXME we probably have to use GailTextCell to salvage this */
-      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);
-#endif
-      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;
-#if 0
-  GtkIconView *icon_view;
-#endif
-
-  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:
-#if 0
-      icon_view = GTK_ICON_VIEW (item->widget);
-      /* FIXME we probably have to use GailTextCell to salvage this */
-      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);
-#endif
-      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;
-#if 0
-  GtkIconView *icon_view;
-#endif
-
-  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:
-#if 0
-      icon_view = GTK_ICON_VIEW (item->widget);
-      /* FIXME we probably have to use GailTextCell to salvage this */
-      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);
-#endif
-      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;
-#if 0
-  GtkIconView *icon_view;
-  PangoRectangle char_rect;
-  const gchar *item_text;
-  gint index;
-#endif
-
-  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;
-
-#if 0
-  icon_view = GTK_ICON_VIEW (item->widget);
-      /* FIXME we probably have to use GailTextCell to salvage this */
-  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;
-#endif
-}
-
-static gint
-gtk_icon_view_item_accessible_text_get_offset_at_point (AtkText      *text,
-                                                        gint          x,
-                                                        gint          y,
-                                                        AtkCoordType coord_type)
-{
-  GtkIconViewItemAccessible *item;
-  gint offset = 0;
-#if 0
-  GtkIconView *icon_view;
-  const gchar *item_text;
-  gint index;
-  gint l_x, l_y;
-#endif
-
-  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;
-
-#if 0
-  icon_view = GTK_ICON_VIEW (item->widget);
-      /* FIXME we probably have to use GailTextCell to salvage this */
-  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);
-#endif
-  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->cell_area.width;
-  *height = item->item->cell_area.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->cell_area.x;
-      *y = l_y + item->item->cell_area.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, NULL);
-  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item->widget));
-  if (gtk_widget_is_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)
-{
-  GtkAllocation allocation;
-  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;
-
-  gtk_widget_get_allocation (item->widget, &allocation);
-
-  icon_view = GTK_ICON_VIEW (item->widget);
-  visible_rect.x = 0;
-  if (icon_view->priv->hadjustment)
-    visible_rect.x += gtk_adjustment_get_value (icon_view->priv->hadjustment);
-  visible_rect.y = 0;
-  if (icon_view->priv->hadjustment)
-    visible_rect.y += gtk_adjustment_get_value (icon_view->priv->vadjustment);
-  visible_rect.width = allocation.width;
-  visible_rect.height = allocation.height;
-
-  if (((item->item->cell_area.x + item->item->cell_area.width) < visible_rect.x) ||
-     ((item->item->cell_area.y + item->item->cell_area.height) < (visible_rect.y)) ||
-     (item->item->cell_area.x > (visible_rect.x + visible_rect.width)) ||
-     (item->item->cell_area.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 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);
-  if (item->item->selected)
-    atk_state_set_add_state (item->state_set, ATK_STATE_SELECTED);
-  else
-    atk_state_set_remove_state (item->state_set, ATK_STATE_SELECTED);
-
-  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_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)
-    {
-      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 */
-      };
-
-      const GInterfaceInfo atk_component_info =
-      {
-        (GInterfaceInitFunc) atk_component_item_interface_init,
-        (GInterfaceFinalizeFunc) NULL,
-        NULL
-      };
-      const GInterfaceInfo atk_action_info =
-      {
-        (GInterfaceInitFunc) atk_action_item_interface_init,
-        (GInterfaceFinalizeFunc) NULL,
-        NULL
-      };
-      const GInterfaceInfo atk_image_info =
-      {
-        (GInterfaceInitFunc) atk_image_item_interface_init,
-        (GInterfaceFinalizeFunc) NULL,
-        NULL
-      };
-      const GInterfaceInfo atk_text_info =
-      {
-        (GInterfaceInitFunc) atk_text_item_interface_init,
-        (GInterfaceFinalizeFunc) NULL,
-        NULL
-      };
-
-      type = g_type_register_static (ATK_TYPE_OBJECT,
-                                     I_("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_get_widget (GTK_ACCESSIBLE (accessible));
-  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_get_widget (GTK_ACCESSIBLE (accessible));
-  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)
-        {
-          gchar *text;
-
-          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);
-
-          text = get_text (icon_view, item);
-          if (text)
-            {
-              gtk_text_buffer_set_text (a11y_item->text_buffer, text, -1);
-              g_free (text);
-            } 
-
-          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_get_widget (GTK_ACCESSIBLE (view));
-      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,
-                                             GtkIconViewAccessible *view)
-{
-  gtk_icon_view_accessible_traverse_items (view, NULL);
-}
-
-static void
-gtk_icon_view_accessible_set_adjustment (AtkObject      *accessible,
-                                         GtkOrientation  orientation,
-                                         GtkAdjustment  *adjustment)
-{
-  GtkIconViewAccessiblePrivate *priv;
-  GtkAdjustment **old_adj_ptr;
-
-  priv = gtk_icon_view_accessible_get_priv (accessible);
-
-  /* Adjustments are set for the first time in constructor and priv is not
-   * initialized at that time, so skip this first setting. */
-  if (!priv)
-    return;
-
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    {
-      if (priv->old_hadj == adjustment)
-        return;
-
-      old_adj_ptr = &priv->old_hadj;
-    }
-  else
-    {
-      if (priv->old_vadj == adjustment)
-        return;
-
-      old_adj_ptr = &priv->old_vadj;
-    }
-
-  /* Disconnect signal handlers */
-  if (*old_adj_ptr)
-    {
-      g_object_remove_weak_pointer (G_OBJECT (*old_adj_ptr),
-                                    (gpointer *)&priv->old_hadj);
-      g_signal_handlers_disconnect_by_func (*old_adj_ptr,
-                                            gtk_icon_view_accessible_adjustment_changed,
-                                            accessible);
-    }
-
-  /* Connect signal */
-  *old_adj_ptr = adjustment;
-  g_object_add_weak_pointer (G_OBJECT (adjustment), (gpointer *)old_adj_ptr);
-  g_signal_connect (adjustment, "value-changed",
-                    G_CALLBACK (gtk_icon_view_accessible_adjustment_changed),
-                    accessible);
-}
-
-static void
-gtk_icon_view_accessible_model_row_changed (GtkTreeModel *tree_model,
-                                            GtkTreePath  *path,
-                                            GtkTreeIter  *iter,
-                                            gpointer      user_data)
-{
-  AtkObject *atk_obj;
-  gint index;
-  GtkWidget *widget;
-  GtkIconView *icon_view;
-  GtkIconViewItem *item;
-  GtkIconViewItemAccessible *a11y_item;
-  const gchar *name;
-  gchar *text;
-
-  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
-  index = gtk_tree_path_get_indices(path)[0];
-  a11y_item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (
-      gtk_icon_view_accessible_find_child (atk_obj, index));
-
-  if (a11y_item)
-    {
-      widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_obj));
-      icon_view = GTK_ICON_VIEW (widget);
-      item = a11y_item->item;
-
-      name = atk_object_get_name (ATK_OBJECT (a11y_item));
-
-      if (!name || strcmp (name, "") == 0)
-        {
-          text = get_text (icon_view, item);
-          if (text)
-            {
-              gtk_text_buffer_set_text (a11y_item->text_buffer, text, -1);
-              g_free (text);
-            }
-        }
-    }
-
-  g_signal_emit_by_name (atk_obj, "visible-data-changed");
-
-  return;
-}
-
-static void
-gtk_icon_view_accessible_model_row_inserted (GtkTreeModel *tree_model,
-                                             GtkTreePath  *path,
-                                             GtkTreeIter  *iter,
-                                             gpointer     user_data)
-{
-  GtkIconViewAccessiblePrivate *priv;
-  GtkIconViewItemAccessibleInfo *info;
-  GtkIconViewAccessible *view;
-  GtkIconViewItemAccessible *item;
-  GList *items;
-  GList *tmp_list;
-  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;
-  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;
-        }
-
-      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;
-}
-
-static void
-gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model,
-                                            GtkTreePath  *path,
-                                            gpointer     user_data)
-{
-  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;
-            
-          info->index = item->item->index;
-        }
-
-      items = items->next;
-    }
-  gtk_icon_view_accessible_traverse_items (view, tmp_list);
-  if (deleted_item)
-    {
-      info = deleted_item->data;
-      gtk_icon_view_item_accessible_add_state (GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item), ATK_STATE_DEFUNCT, TRUE);
-      g_signal_emit_by_name (atk_obj, "children-changed::remove",
-                             index, NULL, NULL);
-      priv->items = g_list_remove_link (priv->items, deleted_item);
-      g_free (info);
-    }
-
-  return;
-}
-
-static gint
-gtk_icon_view_accessible_item_compare (GtkIconViewItemAccessibleInfo *i1,
-                                       GtkIconViewItemAccessibleInfo *i2)
-{
-  return i1->index - i2->index;
-}
-
-static void
-gtk_icon_view_accessible_model_rows_reordered (GtkTreeModel *tree_model,
-                                               GtkTreePath  *path,
-                                               GtkTreeIter  *iter,
-                                               gint         *new_order,
-                                               gpointer     user_data)
-{
-  GtkIconViewAccessiblePrivate *priv;
-  GtkIconViewItemAccessibleInfo *info;
-  GtkIconView *icon_view;
-  GtkIconViewItemAccessible *item;
-  GList *items;
-  AtkObject *atk_obj;
-  gint *order;
-  gint length, i;
-
-  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
-  icon_view = GTK_ICON_VIEW (user_data);
-  priv = gtk_icon_view_accessible_get_priv (atk_obj);
-
-  length = gtk_tree_model_iter_n_children (tree_model, NULL);
-
-  order = g_new (gint, length);
-  for (i = 0; i < length; i++)
-    order [new_order[i]] = i;
-
-  items = priv->items;
-  while (items)
-    {
-      info = items->data;
-      item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item);
-      info->index = order[info->index];
-      item->item = g_list_nth_data (icon_view->priv->items, info->index);
-      items = items->next;
-    }
-  g_free (order);
-  priv->items = g_list_sort (priv->items, 
-                             (GCompareFunc)gtk_icon_view_accessible_item_compare);
-
-  return;
-}
-
-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);
-}
-
-static void
-gtk_icon_view_accessible_clear_cache (GtkIconViewAccessiblePrivate *priv)
-{
-  GtkIconViewItemAccessibleInfo *info;
-  GList *items;
-
-  items = priv->items;
-  while (items)
-    {
-      info = (GtkIconViewItemAccessibleInfo *) items->data;
-      g_object_unref (info->item);
-      g_free (items->data);
-      items = items->next;
-    }
-  g_list_free (priv->items);
-  priv->items = NULL;
-}
-
-static void
-gtk_icon_view_accessible_notify_gtk (GObject *obj,
-                                     GParamSpec *pspec)
-{
-  GtkIconView *icon_view;
-  GtkWidget *widget;
-  AtkObject *atk_obj;
-  GtkIconViewAccessiblePrivate *priv;
-
-  if (strcmp (pspec->name, "model") == 0)
-    {
-      widget = GTK_WIDGET (obj); 
-      atk_obj = gtk_widget_get_accessible (widget);
-      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);
-        }
-    }
-
-  return;
-}
-
-static void
-gtk_icon_view_accessible_initialize (AtkObject *accessible,
-                                     gpointer   data)
-{
-  GtkIconViewAccessiblePrivate *priv;
-  GtkIconView *icon_view;
-
-  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)
-    gtk_icon_view_accessible_set_adjustment (accessible,
-                                            GTK_ORIENTATION_HORIZONTAL,
-                                            icon_view->priv->hadjustment);
-  if (icon_view->priv->vadjustment)
-    gtk_icon_view_accessible_set_adjustment (accessible,
-                                            GTK_ORIENTATION_VERTICAL,
-                                            icon_view->priv->vadjustment);
-  g_signal_connect (data,
-                    "notify",
-                    G_CALLBACK (gtk_icon_view_accessible_notify_gtk),
-                    NULL);
-
-  priv->model = icon_view->priv->model;
-  if (priv->model)
-    {
-      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;
-}
-
-static void
-gtk_icon_view_accessible_finalize (GObject *object)
-{
-  GtkIconViewAccessiblePrivate *priv;
-
-  priv = gtk_icon_view_accessible_get_priv (ATK_OBJECT (object));
-  gtk_icon_view_accessible_clear_cache (priv);
-
-  g_free (priv);
-
-  G_OBJECT_CLASS (accessible_parent_class)->finalize (object);
-}
-
-static void
-gtk_icon_view_accessible_destroyed (GtkWidget *widget,
-                                    GtkAccessible *accessible)
-{
-  AtkObject *atk_obj;
-  GtkIconViewAccessiblePrivate *priv;
-
-  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,
-                                            accessible);
-      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,
-                                            accessible);
-      priv->old_vadj = NULL;
-    }
-}
-
-static void
-gtk_icon_view_accessible_connect_widget_destroyed (GtkAccessible *accessible)
-{
-  GtkWidget *widget;
-
-  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
-  if (widget)
-    {
-      g_signal_connect_after (widget,
-                              "destroy",
-                              G_CALLBACK (gtk_icon_view_accessible_destroyed),
-                              accessible);
-    }
-  GTK_ACCESSIBLE_CLASS (accessible_parent_class)->connect_widget_destroyed (accessible);
-}
-
-static void
-gtk_icon_view_accessible_class_init (AtkObjectClass *klass)
-{
-  GObjectClass *gobject_class;
-  GtkAccessibleClass *accessible_class;
-
-  accessible_parent_class = g_type_class_peek_parent (klass);
-
-  gobject_class = (GObjectClass *)klass;
-  accessible_class = (GtkAccessibleClass *)klass;
-
-  gobject_class->finalize = gtk_icon_view_accessible_finalize;
-
-  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;
-
-  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");
-}
-
-static AtkObject*
-gtk_icon_view_accessible_ref_accessible_at_point (AtkComponent *component,
-                                                  gint          x,
-                                                  gint          y,
-                                                  AtkCoordType  coord_type)
-{
-  GtkWidget *widget;
-  GtkIconView *icon_view;
-  GtkIconViewItem *item;
-  gint x_pos, y_pos;
-
-  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component));
-  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_coords (icon_view, x - x_pos, y - y_pos, TRUE, NULL);
-  if (item)
-    return gtk_icon_view_accessible_ref_child (ATK_OBJECT (component), item->index);
-
-  return NULL;
-}
-
-static void
-atk_component_interface_init (AtkComponentIface *iface)
-{
-  iface->ref_accessible_at_point = gtk_icon_view_accessible_ref_accessible_at_point;
-}
-
-static gboolean
-gtk_icon_view_accessible_add_selection (AtkSelection *selection,
-                                        gint i)
-{
-  GtkWidget *widget;
-  GtkIconView *icon_view;
-  GtkIconViewItem *item;
-
-  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
-  if (widget == NULL)
-    return FALSE;
-
-  icon_view = GTK_ICON_VIEW (widget);
-
-  item = g_list_nth_data (icon_view->priv->items, i);
-
-  if (!item)
-    return FALSE;
-
-  gtk_icon_view_select_item (icon_view, item);
-
-  return TRUE;
-}
-
-static gboolean
-gtk_icon_view_accessible_clear_selection (AtkSelection *selection)
-{
-  GtkWidget *widget;
-  GtkIconView *icon_view;
-
-  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
-  if (widget == NULL)
-    return FALSE;
-
-  icon_view = GTK_ICON_VIEW (widget);
-  gtk_icon_view_unselect_all (icon_view);
-
-  return TRUE;
-}
-
-static AtkObject*
-gtk_icon_view_accessible_ref_selection (AtkSelection *selection,
-                                        gint          i)
-{
-  GList *l;
-  GtkWidget *widget;
-  GtkIconView *icon_view;
-  GtkIconViewItem *item;
-
-  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
-  if (widget == NULL)
-    return NULL;
-
-  icon_view = GTK_ICON_VIEW (widget);
-
-  l = icon_view->priv->items;
-  while (l)
-    {
-      item = l->data;
-      if (item->selected)
-        {
-          if (i == 0)
-           return atk_object_ref_accessible_child (gtk_widget_get_accessible (widget), item->index);
-          else
-            i--;
-        }
-      l = l->next;
-    }
-
-  return NULL;
-}
-
-static gint
-gtk_icon_view_accessible_get_selection_count (AtkSelection *selection)
-{
-  GtkWidget *widget;
-  GtkIconView *icon_view;
-  GtkIconViewItem *item;
-  GList *l;
-  gint count;
-
-  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
-  if (widget == NULL)
-    return 0;
-
-  icon_view = GTK_ICON_VIEW (widget);
-
-  l = icon_view->priv->items;
-  count = 0;
-  while (l)
-    {
-      item = l->data;
-
-      if (item->selected)
-       count++;
-
-      l = l->next;
-    }
-
-  return count;
-}
-
-static gboolean
-gtk_icon_view_accessible_is_child_selected (AtkSelection *selection,
-                                            gint          i)
-{
-  GtkWidget *widget;
-  GtkIconView *icon_view;
-  GtkIconViewItem *item;
-
-  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
-  if (widget == NULL)
-    return FALSE;
-
-  icon_view = GTK_ICON_VIEW (widget);
-
-  item = g_list_nth_data (icon_view->priv->items, i);
-  if (!item)
-    return FALSE;
-
-  return item->selected;
-}
-
-static gboolean
-gtk_icon_view_accessible_remove_selection (AtkSelection *selection,
-                                           gint          i)
-{
-  GtkWidget *widget;
-  GtkIconView *icon_view;
-  GtkIconViewItem *item;
-  GList *l;
-  gint count;
-
-  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
-  if (widget == NULL)
-    return FALSE;
-
-  icon_view = GTK_ICON_VIEW (widget);
-  l = icon_view->priv->items;
-  count = 0;
-  while (l)
-    {
-      item = l->data;
-      if (item->selected)
-        {
-          if (count == i)
-            {
-              gtk_icon_view_unselect_item (icon_view, item);
-              return TRUE;
-            }
-          count++;
-        }
-      l = l->next;
-    }
-
-  return FALSE;
-}
-static gboolean
-gtk_icon_view_accessible_select_all_selection (AtkSelection *selection)
-{
-  GtkWidget *widget;
-  GtkIconView *icon_view;
-
-  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
-  if (widget == NULL)
-    return FALSE;
-
-  icon_view = GTK_ICON_VIEW (widget);
-  gtk_icon_view_select_all (icon_view);
-  return TRUE;
-}
-
-static void
-gtk_icon_view_accessible_selection_interface_init (AtkSelectionIface *iface)
-{
-  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;
-}
-
-static GType
-gtk_icon_view_accessible_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type)
-    {
-      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 */
-      };
-      const GInterfaceInfo atk_component_info =
-      {
-        (GInterfaceInitFunc) atk_component_interface_init,
-        (GInterfaceFinalizeFunc) NULL,
-        NULL
-      };
-      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, 
-                                     I_("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;
-}
-
-static AtkObject *
-gtk_icon_view_accessible_new (GObject *obj)
-{
-  AtkObject *accessible;
-
-  g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL);
-
-  accessible = g_object_new (gtk_icon_view_accessible_get_type (), NULL);
-  atk_object_initialize (accessible, obj);
-
-  return accessible;
-}
-
-static GType
-gtk_icon_view_accessible_factory_get_accessible_type (void)
-{
-  return gtk_icon_view_accessible_get_type ();
-}
-
-static AtkObject*
-gtk_icon_view_accessible_factory_create_accessible (GObject *obj)
-{
-  return gtk_icon_view_accessible_new (obj);
-}
-
-static void
-gtk_icon_view_accessible_factory_class_init (AtkObjectFactoryClass *klass)
-{
-  klass->create_accessible = gtk_icon_view_accessible_factory_create_accessible;
-  klass->get_accessible_type = gtk_icon_view_accessible_factory_get_accessible_type;
-}
-
-static GType
-gtk_icon_view_accessible_factory_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type)
-    {
-      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, 
-                                    I_("GtkIconViewAccessibleFactory"),
-                                    &tinfo, 0);
-    }
-  return type;
-}
-
-
-static AtkObject *
-gtk_icon_view_get_accessible (GtkWidget *widget)
-{
-  static gboolean first_time = TRUE;
-
-  if (first_time)
-    {
-      _gtk_accessible_set_factory_type (GTK_TYPE_ICON_VIEW,
-                                        gtk_icon_view_accessible_factory_get_type ());
-      first_time = FALSE;
-    }
-  return GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->get_accessible (widget);
-}
-
 static gboolean
 gtk_icon_view_buildable_custom_tag_start (GtkBuildable  *buildable,
-                                         GtkBuilder    *builder,
-                                         GObject       *child,
-                                         const gchar   *tagname,
-                                         GMarkupParser *parser,
-                                         gpointer      *data)
+                                          GtkBuilder    *builder,
+                                          GObject       *child,
+                                          const gchar   *tagname,
+                                          GMarkupParser *parser,
+                                          gpointer      *data)
 {
   if (parent_buildable_iface->custom_tag_start (buildable, builder, child,
-                                               tagname, parser, data))
+                                                tagname, parser, data))
     return TRUE;
 
   return _gtk_cell_layout_buildable_custom_tag_start (buildable, builder, child,
-                                                     tagname, parser, data);
+                                                      tagname, parser, data);
 }
 
 static void
 gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildable,
-                                       GtkBuilder   *builder,
-                                       GObject      *child,
-                                       const gchar  *tagname,
-                                       gpointer     *data)
-{
-  if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, 
-                                                 child, tagname, data))
-    parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
-                                           data);
+                                        GtkBuilder   *builder,
+                                        GObject      *child,
+                                        const gchar  *tagname,
+                                        gpointer     *data)
+{
+  if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder,
+                                                  child, tagname, data))
+    parent_buildable_iface->custom_tag_end (buildable, builder,
+                                            child, tagname, data);
 }