diff options
| author | emersion <contact@emersion.fr> | 2018-02-16 18:25:58 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-02-16 18:25:58 +0100 |
| commit | 717bdccb6e07dd74227bdc6827b814f7144957e0 (patch) | |
| tree | 80e5166324f8b89f75aea480f557e7c96400576b /xwayland | |
| parent | 56ab3e9b10fdaaf41eef6e47f81ffe54fd9d5a77 (diff) | |
| parent | 8c1cc45c7db9be4b49ffb27541e908f492fd59ba (diff) | |
Merge remote-tracking branch 'upstream/master' into martinetd/xdg_shell
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/meson.build | 1 | ||||
| -rw-r--r-- | xwayland/xwm.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xwayland/meson.build b/xwayland/meson.build index de05cfaa..2ccdf4cb 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -15,6 +15,7 @@ lib_wlr_xwayland = static_library( xcb_image, xcb_render, xcb_icccm, + xkbcommon, pixman, ], ) diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 10bc2e30..94dfdaab 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -742,7 +742,7 @@ static void xwm_handle_surface_id_message(struct wlr_xwm *xwm, struct wl_resource *resource = wl_client_get_object(xwm->xwayland->client, id); if (resource) { - struct wlr_surface *surface = wl_resource_get_user_data(resource); + struct wlr_surface *surface = wlr_surface_from_resource(resource); xsurface->surface_id = 0; xwm_map_shell_surface(xwm, xsurface, surface); } else { |