gtk+ r22019 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Dec 31 02:44:46 2008
New Revision: 22019
URL: http://svn.gnome.org/viewvc/gtk+?rev=22019&view=rev

Log:
AVoid size allocation loops


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

Modified: trunk/gtk/gtkentry.c
==============================================================================
--- trunk/gtk/gtkentry.c	(original)
+++ trunk/gtk/gtkentry.c	Wed Dec 31 02:44:46 2008
@@ -2488,8 +2488,6 @@
             realize_icon_info (widget, i);
         }
     }
-
-  gtk_widget_queue_resize (widget);
 }
 
 static void
@@ -6191,8 +6189,6 @@
 
   if (GDK_IS_WINDOW (icon_info->window))
     gdk_window_show (icon_info->window);
-
-  gtk_widget_queue_resize (GTK_WIDGET (entry));
 }
 
 
@@ -7088,6 +7084,9 @@
 
   gtk_entry_ensure_pixbuf (entry, icon_pos);
   
+  if (GTK_WIDGET_VISIBLE (entry))
+    gtk_widget_queue_resize (GTK_WIDGET (entry));
+
   g_object_thaw_notify (G_OBJECT (entry));
 }
 
@@ -7149,6 +7148,9 @@
 
   gtk_entry_ensure_pixbuf (entry, icon_pos);
 
+  if (GTK_WIDGET_VISIBLE (entry))
+    gtk_widget_queue_resize (GTK_WIDGET (entry));
+
   g_object_thaw_notify (G_OBJECT (entry));
 }
 
@@ -7213,6 +7215,9 @@
 
   gtk_entry_ensure_pixbuf (entry, icon_pos);
 
+  if (GTK_WIDGET_VISIBLE (entry))
+    gtk_widget_queue_resize (GTK_WIDGET (entry));
+
   g_object_thaw_notify (G_OBJECT (entry));
 }
 
@@ -7274,6 +7279,9 @@
 
   gtk_entry_ensure_pixbuf (entry, icon_pos);
 
+  if (GTK_WIDGET_VISIBLE (entry))
+    gtk_widget_queue_resize (GTK_WIDGET (entry));
+
   g_object_thaw_notify (G_OBJECT (entry));
 }