[gtk/wip/matthiasc/popup5: 33/145] wayland: Stop using surface->parent
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc: 
- Subject: [gtk/wip/matthiasc/popup5: 33/145] wayland: Stop using surface->parent
- Date: Sun, 26 May 2019 19:04:30 +0000 (UTC)
commit e3a2e08637f1742f7999b9c5b93ea845bb932219
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 b4af4e09c7..a1088a74df 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -2850,6 +2850,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
@@ -2859,11 +2861,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]