On Tue, Oct 15, 2013 at 02:29:57PM +0200, David Herrmann wrote:
> We currently call launcher_connect() twice, which is redundant and
> amazingly works (ugh?). Fix this and connect only once to the launcher.
> ---
> src/compositor-fbdev.c | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
Oh right, I came across before that and meant to fix it. Thanks, applied.
Kristian
> diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
> index 002ce0b..4376345 100644
> --- a/src/compositor-fbdev.c
> +++ b/src/compositor-fbdev.c
> @@ -883,15 +883,6 @@ fbdev_compositor_create(struct wl_display *display, int
> *argc, char *argv[],
> config) < 0)
> goto out_free;
>
> - /* Check if we run fbdev-backend using weston-launch */
> - compositor->base.launcher =
> - weston_launcher_connect(&compositor->base, param->tty);
> - 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;
> - }
> -
> compositor->udev = udev_new();
> if (compositor->udev == NULL) {
> weston_log("Failed to initialize udev context.\n");
> @@ -905,7 +896,8 @@ fbdev_compositor_create(struct wl_display *display, int
> *argc, char *argv[],
> compositor->base.launcher =
> weston_launcher_connect(&compositor->base, param->tty);
> if (!compositor->base.launcher) {
> - weston_log("Failed to set up launcher.\n");
> + weston_log("fatal: fbdev backend should be run "
> + "using weston-launch binary or as root\n");
> goto out_udev;
> }
>
> --
> 1.8.4
>
_______________________________________________
wayland-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
