mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2024-11-22 23:22:24 +00:00
Merge branch 'bug/xwayland-ready-listener' into refactor/wlr-drag-icon
This commit is contained in:
commit
390b526450
@ -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
|
||||
};
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user