From 78b2971d6e5b6e9f25871b904ed6b2abe032eeb3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 22 Jan 2009 00:34:30 +0000 Subject: [PATCH] Don't show nonexisting windows svn path=/trunk/; revision=22169 --- ChangeLog | 4 ++++ gtk/gtkentry.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c43b84962..41915cf65b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-01-21 Matthias Clasen + + * gtk/gtkentry.c: Don't show windows that may not exist + 2009-01-21 Matthias Clasen * gtk/gtklabel.c: Implement select-by-words for selectable labels. 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); }