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 d9e71c6e6a12a69ea0e115b0a74b1c989a1347c3..7f7454a2779274f26e2eb3d8635d802adbb229c0 100644 (file)
--- 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;