Don't show nonexisting windows

svn path=/trunk/; revision=22169

diff --git a/ChangeLog b/ChangeLog
index 3c43b84962e3c1d4e7e3bffcb094a11338b122cd..41915cf65b399d5de0f610dad1de565244028ae3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-21  Matthias Clasen <mclasen@redhat.com>
+
+       * gtk/gtkentry.c: Don't show windows that may not exist
+
 2009-01-21  Matthias Clasen <mclasen@redhat.com>
 
        * gtk/gtklabel.c: Implement select-by-words for selectable labels.

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index e34020786a207b20bd6ae752d8483d6332d18630..d4b66f51573235fee7cda1a69aec3e6527cc1ac8 100644 (file)
--- 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);
 }