diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-11-19 10:11:39 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-11-19 10:11:39 -0500 |
| commit | 390b5264500a1c45eea54d8c9ddf3f8302f59021 (patch) | |
| tree | 1adf0f9260d777661d7e5c042f6a62b179635ec9 | |
| parent | 3b74db467b7f628ad45ee319424448a02dc052ec (diff) | |
| parent | 90d2eca218be2beff2465433f0d2937a3d4de267 (diff) | |
Merge branch 'bug/xwayland-ready-listener' into refactor/wlr-drag-icon
| -rw-r--r-- | include/rootston/desktop.h | 1 | ||||
| -rw-r--r-- | rootston/main.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index b809db43..10e5bbc6 100644 --- 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 }; diff --git a/rootston/main.c b/rootston/main.c index 814d3aef..46548094 100644 --- 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); } |