aboutsummaryrefslogtreecommitdiff
path: root/xwayland/xwayland.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-09-28 19:05:59 -0400
committerGitHub <noreply@github.com>2017-09-28 19:05:59 -0400
commite4ad534ab41b01a08b6b4f19aa47805f6040f7b4 (patch)
treee29b0788e128fb8fb228fa5dc8af24a0f47cd887 /xwayland/xwayland.c
parent262c3b1638d42012d6be9ce9f5a3f4c2f7cdaae1 (diff)
parent10240af6ea2e3cef474c2e79e9ca220f028cce2d (diff)
Merge pull request #167 from emersion/xwayland
[WIP] Improve xwayland
Diffstat (limited to 'xwayland/xwayland.c')
-rw-r--r--xwayland/xwayland.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index 6a521393..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,7 @@ 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);