From b816c1670150e265719b2fc2ff2a149b50181298 Mon Sep 17 00:00:00 2001 From: John Lindgren Date: Mon, 17 Jul 2023 02:33:40 -0400 Subject: [PATCH] Chase wlroots: Stop using wlr_xwayland_surface event data Chases: 27edd024f83892f4af9c5084d47b73f26966aaf1 xwayland: pass NULL as event data --- src/xwayland.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/xwayland.c b/src/xwayland.c index cd337e24..7bfd33a2 100644 --- a/src/xwayland.c +++ b/src/xwayland.c @@ -201,7 +201,6 @@ handle_destroy(struct wl_listener *listener, void *data) { struct view *view = wl_container_of(listener, view, destroy); struct xwayland_view *xwayland_view = xwayland_view_from_view(view); - assert(data && data == xwayland_view->xwayland_surface); assert(xwayland_view->xwayland_surface->data == view); if (view->surface) { @@ -355,7 +354,6 @@ handle_set_decorations(struct wl_listener *listener, void *data) struct xwayland_view *xwayland_view = wl_container_of(listener, xwayland_view, set_decorations); struct view *view = &xwayland_view->base; - assert(data && data == xwayland_view->xwayland_surface); view_set_decorations(view, want_deco(xwayland_view->xwayland_surface)); } @@ -366,8 +364,7 @@ handle_override_redirect(struct wl_listener *listener, void *data) struct xwayland_view *xwayland_view = wl_container_of(listener, xwayland_view, override_redirect); struct view *view = &xwayland_view->base; - struct wlr_xwayland_surface *xsurface = data; - assert(xsurface && xsurface == xwayland_view->xwayland_surface); + struct wlr_xwayland_surface *xsurface = xwayland_view->xwayland_surface; struct server *server = view->server; bool mapped = xsurface->mapped;