gtk+ r21926 - in trunk: . gtk

[liyuan svn gnome org]

Author: liyuan
Date: Mon Dec 22 09:04:19 2008
New Revision: 21926
URL: http://svn.gnome.org/viewvc/gtk+?rev=21926&view=rev

Log:
2008-12-23  Li Yuan  <li yuan sun com>

        * gtk/gtkiconview.c: (gtk_icon_view_accessible_model_row_changed):
        Bug #549251. No need to set name if there is no a11y item object.


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

Modified: trunk/gtk/gtkiconview.c
==============================================================================
--- trunk/gtk/gtkiconview.c	(original)
+++ trunk/gtk/gtkiconview.c	Mon Dec 22 09:04:19 2008
@@ -8891,20 +8891,23 @@
   index = gtk_tree_path_get_indices(path)[0];
   a11y_item = gtk_icon_view_accessible_find_child (atk_obj, index);
 
-  widget = GTK_ACCESSIBLE (atk_obj)->widget;
-  icon_view = GTK_ICON_VIEW (widget);
-  item = a11y_item->item;
+  if (a11y_item)
+    {
+      widget = GTK_ACCESSIBLE (atk_obj)->widget;
+      icon_view = GTK_ICON_VIEW (widget);
+      item = a11y_item->item;
 
-  name = gtk_icon_view_item_accessible_get_name (ATK_OBJECT (a11y_item));
+      name = gtk_icon_view_item_accessible_get_name (ATK_OBJECT (a11y_item));
 
-  if (!name || strcmp (name, "") == 0)
-    {
-      gtk_icon_view_set_cell_data (icon_view, item);
-      text = get_text (icon_view, item);
-      if (text)
+      if (!name || strcmp (name, "") == 0)
         {
-          gtk_text_buffer_set_text (a11y_item->text_buffer, text, -1);
-          g_free (text);
+          gtk_icon_view_set_cell_data (icon_view, item);
+          text = get_text (icon_view, item);
+          if (text)
+            {
+              gtk_text_buffer_set_text (a11y_item->text_buffer, text, -1);
+              g_free (text);
+            }
         }
     }