diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-09-17 14:41:03 -0700 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-09-18 11:14:14 -0700 |
| commit | 05ad1e4e8ab5794f827445711a72ffe95dcbdb8b (patch) | |
| tree | eb6a34d16d0c0463af69ddd2632bca1219ab95c0 /src/compositor-fbdev.c | |
| parent | bf3c374b1bb26e827ed6a1ea2fe72d20aacc2d68 (diff) | |
| download | weston-05ad1e4e8ab5794f827445711a72ffe95dcbdb8b.tar.gz | |
launcher: Collect launcher state in new struct weston_launcher
We're going to add a bit more launcher state, so start out by creating
a new struct weston_launcher we can track it in.
Diffstat (limited to 'src/compositor-fbdev.c')
| -rw-r--r-- | src/compositor-fbdev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c index 6f5e62e3..495c3a3b 100644 --- a/src/compositor-fbdev.c +++ b/src/compositor-fbdev.c @@ -887,9 +887,8 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], goto out_free; /* Check if we run fbdev-backend using weston-launch */ - compositor->base.launcher_sock = - weston_environment_get_fd("WESTON_LAUNCHER_SOCK"); - if (compositor->base.launcher_sock == -1 && geteuid() != 0) { + compositor->base.launcher = weston_launcher_connect(&compositor->base); + if (compositor->base.launcher == NULL && geteuid() != 0) { weston_log("fatal: fbdev backend should be run " "using weston-launch binary or as root\n"); goto out_compositor; |