[gtk+] gtkwindow: Do not show subsurface windows for hidden popover widgets

[Carlos Garnacho <carlosg src gnome org>]

commit d070e4c7429a6c964556af01973feae6740c0d18
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Feb 25 15:52:49 2015 +0100

    gtkwindow: Do not show subsurface windows for hidden popover widgets
    
    This is really just necessary when we have a visible widget, otherwise
    the window would temporarily linger with odd size and surface.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=743427

 gtk/gtkwindow.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index ab96261..ba79229 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5948,16 +5948,12 @@ static void
 popover_map (GtkWidget        *widget,
              GtkWindowPopover *popover)
 {
-  if (popover->window)
+  if (popover->window && gtk_widget_get_visible (popover->widget))
     {
       gdk_window_show (popover->window);
-
-      if (gtk_widget_get_visible (popover->widget))
-        {
-          gtk_widget_map (popover->widget);
-          popover->unmap_id = g_signal_connect (popover->widget, "unmap",
-                                                G_CALLBACK (popover_unmap), popover);
-        }
+      gtk_widget_map (popover->widget);
+      popover->unmap_id = g_signal_connect (popover->widget, "unmap",
+                                            G_CALLBACK (popover_unmap), popover);
     }
 }