[PATCH weston] screen-share: Use wet_get_config()

Quentin Glidic sardemff7+wayland at sardemff7.net
Tue Jun 21 11:23:48 UTC 2016


On 21/06/2016 01:58, Daniel Stone wrote:
> compositor->config was removed a while ago.
>
> Signed-off-by: Daniel Stone <daniels at collabora.com>

Wrote the same and lazily forget to send it.
Reviewed-by: Quentin Glidic <sardemff7+git at sardemff7.net>


Cheers,


> ---
>  src/screen-share.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/screen-share.c b/src/screen-share.c
> index 196173e..c9e7436 100644
> --- a/src/screen-share.c
> +++ b/src/screen-share.c
> @@ -40,6 +40,7 @@
>  #include <wayland-client.h>
>
>  #include "compositor.h"
> +#include "weston.h"
>  #include "shared/helpers.h"
>  #include "shared/os-compatibility.h"
>  #include "fullscreen-shell-unstable-v1-client-protocol.h"
> @@ -1108,6 +1109,7 @@ module_init(struct weston_compositor *compositor,
>  	    int *argc, char *argv[])
>  {
>  	struct screen_share *ss;
> +	struct weston_config *config = wet_get_config(compositor);
>  	struct weston_config_section *section;
>
>  	ss = zalloc(sizeof *ss);
> @@ -1115,8 +1117,7 @@ module_init(struct weston_compositor *compositor,
>  		return -1;
>  	ss->compositor = compositor;
>
> -	section = weston_config_get_section(compositor->config, "screen-share",
> -					    NULL, NULL);
> +	section = weston_config_get_section(config, "screen-share", NULL, NULL);
>
>  	weston_config_section_get_string(section, "command", &ss->command, "");
>
>


-- 

Quentin “Sardem FF7” Glidic


More information about the wayland-devel mailing list