diff options
| -rw-r--r-- | compositor/xwayland.c | 2 | ||||
| -rw-r--r-- | include/libweston/xwayland-api.h | 5 | ||||
| -rw-r--r-- | xwayland/launcher.c | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/compositor/xwayland.c b/compositor/xwayland.c index 5a1e19e1..f56ce0b7 100644 --- a/compositor/xwayland.c +++ b/compositor/xwayland.c @@ -99,7 +99,7 @@ xserver_cleanup(struct wet_process *process, int status, void *data) * right one */ assert(process == wxw->process); - wxw->api->xserver_exited(wxw->xwayland, status); + wxw->api->xserver_exited(wxw->xwayland); wxw->process = NULL; } diff --git a/include/libweston/xwayland-api.h b/include/libweston/xwayland-api.h index 0fcfc149..649721eb 100644 --- a/include/libweston/xwayland-api.h +++ b/include/libweston/xwayland-api.h @@ -37,7 +37,7 @@ extern "C" { struct weston_compositor; struct weston_xwayland; -#define WESTON_XWAYLAND_API_NAME "weston_xwayland_v2" +#define WESTON_XWAYLAND_API_NAME "weston_xwayland_v3" #define WESTON_XWAYLAND_SURFACE_API_NAME "weston_xwayland_surface_v1" typedef struct wl_client * @@ -102,10 +102,9 @@ struct weston_xwayland_api { * socket, and may call the spawn function again. * * \param xwayland The Xwayland context object. - * \param exit_status The exit status of the Xwayland server process. */ void - (*xserver_exited)(struct weston_xwayland *xwayland, int exit_status); + (*xserver_exited)(struct weston_xwayland *xwayland); }; /** Retrieve the API object for the libweston Xwayland module. diff --git a/xwayland/launcher.c b/xwayland/launcher.c index c14c313e..7a8008d8 100644 --- a/xwayland/launcher.c +++ b/xwayland/launcher.c @@ -311,8 +311,7 @@ weston_xwayland_xserver_loaded(struct weston_xwayland *xwayland, int wm_fd) } static void -weston_xwayland_xserver_exited(struct weston_xwayland *xwayland, - int exit_status) +weston_xwayland_xserver_exited(struct weston_xwayland *xwayland) { struct weston_xserver *wxs = (struct weston_xserver *)xwayland; @@ -328,14 +327,14 @@ weston_xwayland_xserver_exited(struct weston_xwayland *xwayland, weston_xserver_handle_event, wxs); if (wxs->wm) { - weston_log("xserver exited, code %d\n", exit_status); + weston_log("xserver exited, will restart on demand\n"); weston_wm_destroy(wxs->wm); wxs->wm = NULL; } else { /* If the X server crashes before it binds to the * xserver interface, shut down and don't try * again. */ - weston_log("xserver crashing too fast: %d\n", exit_status); + weston_log("xserver crashing too fast, not restarting\n"); weston_xserver_shutdown(wxs); } } |