gtk+ r20813 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Thu Jul 10 16:37:53 2008
New Revision: 20813
URL: http://svn.gnome.org/viewvc/gtk+?rev=20813&view=rev

Log:
fix a segfault in the a11y code


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkiconview.c

Modified: trunk/gtk/gtkiconview.c
==============================================================================
--- trunk/gtk/gtkiconview.c	(original)
+++ trunk/gtk/gtkiconview.c	Thu Jul 10 16:37:53 2008
@@ -8970,8 +8970,8 @@
         {
           if (tmp_list == NULL)
             tmp_list = items;
-          else    
-            info->index = item->item->index;
+            
+          info->index = item->item->index;
         }
 
       items = items->next;
@@ -8981,11 +8981,8 @@
     {
       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);
-  if (deleted_item)
-    {
+      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);
     }