[PATCH weston v2 4/8] compositor: remove the weston_config field in weston_compositor

Quentin Glidic sardemff7+wayland at sardemff7.net
Thu Jun 2 08:26:46 UTC 2016


On 01/06/2016 20:43, Giulio Camuffo wrote:
> The config can now be retrieved with a new function defined in weston.h,
> weston_get_config(weston_compositor*).
>
> Signed-off-by: Giulio Camuffo <giuliocamuffo at gmail.com>
> ---
>  desktop-shell/shell.c      | 2 +-
>  ivi-shell/hmi-controller.c | 6 +++---
>  ivi-shell/ivi-shell.c      | 3 ++-
>  src/cms-static.c           | 3 ++-
>  src/compositor.h           | 1 -
>  src/libinput-device.c      | 4 +++-
>  src/main.c                 | 9 +++++++--
>  src/text-backend.c         | 3 ++-
>  src/weston.h               | 3 +++
>  xwayland/launcher.c        | 5 +++--
>  10 files changed, 26 insertions(+), 13 deletions(-)
>

Really nice:
Reviewed-by: Quentin Glidic <sardemff7+git at sardemff7.net>

Just one comment, which is not about this very patch alone.

> [snip]
> diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
> index 59ffe0c..a312485 100644
> --- a/ivi-shell/ivi-shell.c
> +++ b/ivi-shell/ivi-shell.c
> @@ -46,6 +46,7 @@
>  #include "ivi-layout-export.h"
>  #include "ivi-layout-shell.h"
>  #include "shared/helpers.h"
> +#include "weston.h"

You use "weston.h" here, and "src/weston.h" in tests. It’s a bit 
inconsistent. But I see "shared/helpers.h" while shared is also in the 
include dirs so if consistency is wanted, we probably want a cleanup 
patch touching everything.


>  /* Representation of ivi_surface protocol object. */
>  struct ivi_shell_surface
> @@ -416,7 +417,7 @@ ivi_shell_setting_create(struct ivi_shell_setting *dest,
>  			 int *argc, char *argv[])
>  {
>  	int result = 0;
> -	struct weston_config *config = compositor->config;
> +	struct weston_config *config = weston_get_config(compositor);
>  	struct weston_config_section *section;
>
>  	const struct weston_option ivi_shell_options[] = {
> [snip]

Cheers,

-- 

Quentin “Sardem FF7” Glidic


More information about the wayland-devel mailing list