[gtk/wip/matthiasc/popup5: 31/109] wayland: Stop using surface->parent
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/popup5: 31/109] wayland: Stop using surface->parent
- Date: Mon, 20 May 2019 00:08:27 +0000 (UTC)
commit d46a5d0e6bc7fac4f7f8beb2a9be351e6223a230
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 8f9ae820d1..2dae075773 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -2868,6 +2868,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
@@ -2878,11 +2880,8 @@ gdk_wayland_surface_destroy (GdkSurface *surface,
gdk_wayland_surface_unmap_surface (surface);
gdk_wayland_surface_destroy_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]