From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Fri, 29 Sep 2023 02:50:47 +0000 (+0200)
Subject: Chase wlroots: Stop using wlr_xwayland_surface event data
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=d503370a7754fba271a412c04414f06395b15e4b;p=proto%2Flabwc.git

Chase wlroots: Stop using wlr_xwayland_surface event data

Follow-up from b816c1670150e265719b2fc2ff2a149b50181298
Chase wlroots: Stop using wlr_xwayland_surface event data

Chases: 27edd024f83892f4af9c5084d47b73f26966aaf1
xwayland: pass NULL as event data
---

diff --git a/src/xwayland-unmanaged.c b/src/xwayland-unmanaged.c
index d9e71c6e..7f7454a2 100644
--- a/src/xwayland-unmanaged.c
+++ b/src/xwayland-unmanaged.c
@@ -153,11 +153,12 @@ static void
 unmanaged_handle_request_activate(struct wl_listener *listener, void *data)
 {
 	wlr_log(WLR_DEBUG, "handle unmanaged request_activate");
-	struct wlr_xwayland_surface *xsurface = data;
+	struct xwayland_unmanaged *unmanaged =
+		wl_container_of(listener, unmanaged, request_activate);
+	struct wlr_xwayland_surface *xsurface = unmanaged->xwayland_surface;
 	if (!xsurface->mapped) {
 		return;
 	}
-	struct xwayland_unmanaged *unmanaged = xsurface->data;
 	struct server *server = unmanaged->server;
 	struct seat *seat = &server->seat;