Merge pull request #432 from acrisci/bug/xwayland-ready-listener

rootston: xwayland ready listener
7 years ago · 358654e212
parent fa36ac90f7 90d2eca218
commit 358654e212
2 changed files with 4 additions and 2 deletions
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@ -50,6 +50,7 @@ struct roots_desktop {
 #ifdef HAS_XWAYLAND
 	struct wlr_xwayland *xwayland;
 	struct wl_listener xwayland_surface;
+	struct wl_listener xwayland_ready;
 #endif
 };

--- a/rootston/main.c
+++ b/rootston/main.c
@ -59,8 +59,9 @@ int main(int argc, char **argv) {
 	ready(NULL, NULL);
 #else
 	if (server.desktop->xwayland != NULL) {
-		struct wl_listener xwayland_ready = { .notify = ready };
-		wl_signal_add(&server.desktop->xwayland->events.ready, &xwayland_ready);
+		wl_signal_add(&server.desktop->xwayland->events.ready,
+			&server.desktop->xwayland_ready);
+		server.desktop->xwayland_ready.notify = ready;
 	} else {
 		ready(NULL, NULL);
 	}