From 1a59583fda552ca482f5defe6a10ba2f3759fc75 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 1 Oct 2015 22:36:34 +0200
Subject: [PATCH] window: Don't queue resizes when inhibiting resizes

Since the frame clock, the inhibit happens on the GDK level, so this
code is no longer necessary.
---
 gtk/gtkcontainer.c | 12 ------------
 gtk/gtkwindow.c    |  9 +--------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 79945292f7..4eff5b54d0 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1670,9 +1670,6 @@ gtk_container_destroy (GtkWidget *widget)
   GtkContainer *container = GTK_CONTAINER (widget);
   GtkContainerPrivate *priv = container->priv;
 
-  if (priv->resize_pending)
-    _gtk_container_dequeue_resize_handler (container);
-
   if (priv->restyle_pending)
     priv->restyle_pending = FALSE;
 
@@ -1901,15 +1898,6 @@ gtk_container_remove (GtkContainer *container,
   g_object_unref (container);
 }
 
-void
-_gtk_container_dequeue_resize_handler (GtkContainer *container)
-{
-  g_return_if_fail (GTK_IS_CONTAINER (container));
-  g_return_if_fail (container->priv->resize_pending);
-
-  container->priv->resize_pending = FALSE;
-}
-
 /**
  * gtk_container_set_resize_mode:
  * @container: a #GtkContainer
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 412e6f1e99..93f6b202f2 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -7544,7 +7544,7 @@ gtk_window_configure_event (GtkWidget         *widget,
   
   priv->configure_notify_received = TRUE;
 
-  gtk_widget_queue_resize (widget);
+  gtk_widget_queue_allocate (widget);
   gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
   
   return TRUE;
@@ -9486,13 +9486,6 @@ gtk_window_move_resize (GtkWindow *window)
 	   * FIXME: we should also dequeue the pending redraws here, since
 	   * we handle those ourselves upon ->configure_notify_received==TRUE.
 	   */
-          G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-	  if (gtk_container_get_resize_mode (container) == GTK_RESIZE_QUEUE)
-	    {
-	      gtk_widget_queue_resize_no_redraw (widget);
-	      _gtk_container_dequeue_resize_handler (container);
-	    }
-          G_GNUC_END_IGNORE_DEPRECATIONS;
 	}
     }
   else