gtk+ r22169 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Thu Jan 22 00:34:30 2009
New Revision: 22169
URL: http://svn.gnome.org/viewvc/gtk+?rev=22169&view=rev

Log:
Don't show nonexisting windows


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkentry.c

Modified: trunk/gtk/gtkentry.c
==============================================================================
--- trunk/gtk/gtkentry.c	(original)
+++ trunk/gtk/gtkentry.c	Thu Jan 22 00:34:30 2009
@@ -2432,7 +2432,7 @@
     {
       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_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 @@
       break;
     }
     
-  if (icon_info->pixbuf != NULL)
+  if (icon_info->pixbuf != NULL && icon_info->window != NULL)
     gdk_window_show_unraised (icon_info->window);
 }