summaryrefslogtreecommitdiff
path: root/gtk/gtkentry.c
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2009-01-22 00:34:30 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2009-01-22 00:34:30 +0000
commit78b2971d6e5b6e9f25871b904ed6b2abe032eeb3 (patch)
tree6d1bc8f377125b6865c868d0eebde3d5af1abdaf /gtk/gtkentry.c
parent52f097537088d28cae272a14375426b608cf6463 (diff)
downloadgtk+-78b2971d6e5b6e9f25871b904ed6b2abe032eeb3.tar.gz
Don't show nonexisting windows
svn path=/trunk/; revision=22169
Diffstat (limited to 'gtk/gtkentry.c')
-rw-r--r--gtk/gtkentry.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index e34020786a..d4b66f5157 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2432,7 +2432,7 @@ update_cursors (GtkWidget *widget)
{
if ((icon_info = priv->icons[i]) != NULL)
{
- if (icon_info->pixbuf != NULL)
+ if (icon_info->pixbuf != NULL && icon_info->window != NULL)
gdk_window_show_unraised (icon_info->window);
/* The icon windows are not children of the visible entry window,
@@ -3772,7 +3772,7 @@ gtk_entry_motion_notify (GtkWidget *widget,
gtk_entry_set_positions (entry, pos, bound);
}
else
- gtk_entry_set_positions (entry, tmp_pos, -1);
+ gtk_entry_set_positions (entry, tmp_pos, -1);
}
return TRUE;
@@ -6305,7 +6305,7 @@ gtk_entry_ensure_pixbuf (GtkEntry *entry,
break;
}
- if (icon_info->pixbuf != NULL)
+ if (icon_info->pixbuf != NULL && icon_info->window != NULL)
gdk_window_show_unraised (icon_info->window);
}