[gtk/wip/matthiasc/popup2: 77/108] wayland: Stop using surface->parent
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/popup2: 77/108] wayland: Stop using surface->parent
- Date: Mon, 25 Mar 2019 20:59:54 +0000 (UTC)
commit c8b52721c55dd19b45a5a9ec3fba0904a362d517
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 c5b4f47aef..9fd6d2e065 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -2841,6 +2841,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
@@ -2850,11 +2852,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]