diff --git a/ChangeLog b/ChangeLog
index 6bb4321cee..288fc320ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcontainer.c (_gtk_container_queue_resize): Acknowledge 
+	the fact that invariants are broken and loop all the way up to 
+	the resize container.
+
 Tue Oct 12 17:11:02 2004    <timj@birnet.org>
 
 	* gtk/gtkwidget.c (gtk_widget_set_usize_internal): don't queue the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6bb4321cee..288fc320ba 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-10-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcontainer.c (_gtk_container_queue_resize): Acknowledge 
+	the fact that invariants are broken and loop all the way up to 
+	the resize container.
+
 Tue Oct 12 17:11:02 2004    <timj@birnet.org>
 
 	* gtk/gtkwidget.c (gtk_widget_set_usize_internal): don't queue the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6bb4321cee..288fc320ba 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-10-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcontainer.c (_gtk_container_queue_resize): Acknowledge 
+	the fact that invariants are broken and loop all the way up to 
+	the resize container.
+
 Tue Oct 12 17:11:02 2004    <timj@birnet.org>
 
 	* gtk/gtkwidget.c (gtk_widget_set_usize_internal): don't queue the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6bb4321cee..288fc320ba 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-10-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcontainer.c (_gtk_container_queue_resize): Acknowledge 
+	the fact that invariants are broken and loop all the way up to 
+	the resize container.
+
 Tue Oct 12 17:11:02 2004    <timj@birnet.org>
 
 	* gtk/gtkwidget.c (gtk_widget_set_usize_internal): don't queue the
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index d541a6f640..c8b070ed42 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1132,7 +1132,7 @@ _gtk_container_queue_resize (GtkContainer *container)
   widget = GTK_WIDGET (container);
   resize_container = gtk_container_get_resize_container (container);
   
-  while (!GTK_WIDGET_ALLOC_NEEDED (widget) || !GTK_WIDGET_REQUEST_NEEDED (widget))
+  while (TRUE)
     {
       GTK_PRIVATE_SET_FLAG (widget, GTK_ALLOC_NEEDED);
       GTK_PRIVATE_SET_FLAG (widget, GTK_REQUEST_NEEDED);