[gtk/wip/matthiasc/popup4: 43/79] wayland: Stop using surface->parent



commit 39b5fd78351f03ef6e0a1acc5e75684008b0005a
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Mar 23 09:11:46 2019 -0400

    wayland: Stop using surface->parent
    
    It is always NULL.

 gdk/wayland/gdksurface-wayland.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index 116cf09953..887016176d 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -2844,6 +2844,8 @@ gdk_wayland_surface_destroy (GdkSurface *surface,
                              gboolean    recursing,
                              gboolean    foreign_destroy)
 {
+  GdkWaylandDisplay *display;
+
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
   /* Wayland surfaces can't be externally destroyed; we may possibly
@@ -2853,11 +2855,8 @@ gdk_wayland_surface_destroy (GdkSurface *surface,
 
   gdk_wayland_surface_hide_surface (surface);
 
-  if (surface->parent == NULL)
-    {
-      GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
-      display->toplevels = g_list_remove (display->toplevels, surface);
-    }
+  display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
+  display->toplevels = g_list_remove (display->toplevels, surface);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]