[gtk/wip/matthiasc/popup4: 7/79] widget: guard popover-specific code paths

[Matthias Clasen <matthiasc src gnome org>]

commit 5ee0f434caf67ac1b865c0828cfb2a4ba95f7e02
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Feb 24 18:41:26 2019 -0500

    widget: guard popover-specific code paths
    
    This is essentially a special case just for GtkPopover,
    which is the last widget with a child surface.

 gtk/gtkwidget.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index c98964fca7..d1527e8f35 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4205,7 +4205,8 @@ gtk_widget_allocate (GtkWidget    *widget,
     {
       /* Still have to move the window... */
       if (_gtk_widget_get_realized (widget) &&
-          _gtk_widget_get_has_surface (widget))
+          _gtk_widget_get_has_surface (widget) &&
+          GTK_IS_POPOVER (widget))
          {
            GtkAllocation window_alloc;
 
@@ -4417,7 +4418,8 @@ gtk_widget_real_size_allocate (GtkWidget *widget,
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
 
   if (_gtk_widget_get_realized (widget) &&
-      _gtk_widget_get_has_surface (widget))
+      _gtk_widget_get_has_surface (widget) &&
+      GTK_IS_POPOVER (widget))
      {
        GtkAllocation window_alloc;