[PATCH] Override modules list and don't always load desktop-shell.so

[Giulio Camuffo]

Oh thanks, i needed this. I can now stop modifying weston.ini back and
forth. :)

Looks good to me.



2013/4/1 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>

> Let --modules override modules list and load desktop-shell.so as a
> fallback if a modules list is not specified neither by passing
> --modules nor with weston.ini.
> ---
>  src/compositor.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/src/compositor.c b/src/compositor.c
> index 1617d96..e2475c8 100644
> --- a/src/compositor.c
> +++ b/src/compositor.c
> @@ -3611,10 +3611,13 @@ int main(int argc, char *argv[])
>
>         setenv("WAYLAND_DISPLAY", socket_name, 1);
>
> -       if (load_modules(ec, modules, &argc, argv, config_file) < 0)
> -               goto out;
> -       if (load_modules(ec, option_modules, &argc, argv, config_file) < 0)
> -               goto out;
> +       if (option_modules == NULL) {
> +               if (load_modules(ec, modules, &argc, argv, config_file) <
> 0)
> +                       goto out;
> +       } else {
> +               if (load_modules(ec, option_modules, &argc, argv,
> config_file) < 0)
> +                       goto out;
> +       }
>
>         free(config_file);
>
> --
> 1.8.2
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20130401/bf2b539e/attachment.html>