]> Pileus Git - ~andy/gtk/commitdiff
Add missing NULL-check in GtkEntryAccessible
authorMario Sanchez Prada <msanchez@gnome.org>
Sun, 9 Dec 2012 10:49:35 +0000 (11:49 +0100)
committerMario Sanchez Prada <msanchez@gnome.org>
Sun, 9 Dec 2012 10:52:11 +0000 (11:52 +0100)
Only call to atk_object_set_name if gtk_entry_get_icon_name() is not NULL.

https://bugzilla.gnome.org/show_bug.cgi?id=689923

gtk/a11y/gtkentryaccessible.c

index 5f113da7e9043e3df34f2f3c07c9169ecc943daa..44280b64a82cb02d494b902fe482acb4a88f4dbd 100644 (file)
@@ -549,7 +549,8 @@ gtk_entry_accessible_notify_gtk (GObject    *obj,
           const gchar *name;
           name = gtk_entry_get_icon_name (gtk_entry,
                                           GTK_ENTRY_ICON_PRIMARY);
-          atk_object_set_name (priv->icons[GTK_ENTRY_ICON_PRIMARY], name);
+          if (name)
+            atk_object_set_name (priv->icons[GTK_ENTRY_ICON_PRIMARY], name);
         }
     }
   else if (g_strcmp0 (pspec->name, "secondary-icon-name") == 0)
@@ -559,7 +560,8 @@ gtk_entry_accessible_notify_gtk (GObject    *obj,
           const gchar *name;
           name = gtk_entry_get_icon_name (gtk_entry,
                                           GTK_ENTRY_ICON_SECONDARY);
-          atk_object_set_name (priv->icons[GTK_ENTRY_ICON_SECONDARY], name);
+          if (name)
+            atk_object_set_name (priv->icons[GTK_ENTRY_ICON_SECONDARY], name);
         }
     }
   else if (g_strcmp0 (pspec->name, "primary-icon-tooltip-text") == 0)