diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-28 19:06:41 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-09-28 19:06:41 -0400 |
| commit | 033036712ade73a872f1034ddb47235be11a74aa (patch) | |
| tree | ecae511da6a408177369858ac43d200bae427472 /xwayland/xwayland.c | |
| parent | 2850a9360b23eaf27f6437a889b13bdcbe506863 (diff) | |
| parent | e4ad534ab41b01a08b6b4f19aa47805f6040f7b4 (diff) | |
Merge branch 'rootston'
Diffstat (limited to 'xwayland/xwayland.c')
| -rw-r--r-- | xwayland/xwayland.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index bed2e00e..d3bb41a0 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -86,7 +86,7 @@ static void exec_xwayland(struct wlr_xwayland *wlr_xwayland) { _exit(EXIT_FAILURE); } - if (clearenv()) { + if (clearenv()) { wlr_log_errno(L_ERROR, "clearenv failed"); _exit(EXIT_FAILURE); } @@ -105,7 +105,7 @@ static void exec_xwayland(struct wlr_xwayland *wlr_xwayland) { } static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland, - struct wl_display *wl_display, struct wlr_compositor *compositor); + struct wl_display *wl_display, struct wlr_compositor *compositor); static void wlr_xwayland_finish(struct wlr_xwayland *wlr_xwayland); static void xwayland_destroy_event(struct wl_listener *listener, void *data) { @@ -193,7 +193,8 @@ static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland, wlr_xwayland->x_fd[0] = wlr_xwayland->x_fd[1] = -1; wlr_xwayland->wl_fd[0] = wlr_xwayland->wl_fd[1] = -1; wlr_xwayland->wm_fd[0] = wlr_xwayland->wm_fd[1] = -1; - wl_list_init(&wlr_xwayland->displayable_windows); + wl_list_init(&wlr_xwayland->displayable_surfaces); + wl_signal_init(&wlr_xwayland->events.new_surface); wlr_xwayland->display = open_display_sockets(wlr_xwayland->x_fd); if (wlr_xwayland->display < 0) { |