Fixed gtk_entry_set_icon_tooltip_text & markup to not crash

Setting this property before the icon is actually set was
resulting in a crash (found by way of Glade bug 606103).

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 8463311fc0f63c2bdcfec926e4c21e4ec47a2d75..9efabbd0a4def09defd9785cb58b1064e689b0b6 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -8481,8 +8481,8 @@ gtk_entry_set_icon_tooltip_text (GtkEntry             *entry,
 
   priv = entry->priv;
 
-  if (!(icon_info = priv->icons[icon_pos]))
-    icon_info = priv->icons[icon_pos];
+  if ((icon_info = priv->icons[icon_pos]) == NULL)
+    icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
 
   if (icon_info->tooltip)
     g_free (icon_info->tooltip);
@@ -8561,8 +8561,8 @@ gtk_entry_set_icon_tooltip_markup (GtkEntry             *entry,
 
   priv = entry->priv;
 
-  if (!(icon_info = priv->icons[icon_pos]))
-    icon_info = priv->icons[icon_pos];
+  if ((icon_info = priv->icons[icon_pos]) == NULL)
+    icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
 
   if (icon_info->tooltip)
     g_free (icon_info->tooltip);