[PATCH weston v2] screen-share: Don't unset server environment variables

[Jason Ekstrand]

Looks good to me.

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
On Apr 30, 2014 3:52 AM, "Andrew Wedgbury" <andrew.wedgbury at realvnc.com>
wrote:

> There is no need to unset WAYLAND_DISPLAY and WAYLAND_SOCKET when
> screen-share
> launches the fullscreen shell server. This was done originally in case the
> launched server decided to use the wayland backend based on the presence of
> these. However, we pass a command line argument telling it to use the RDP
> backend, which overrides the automatic backend selection based on the
> environment.
>
> Keeping these environment variables allows the launched fullscreen shell
> server
> to know the original server's display name, which it may need in order to
> show
> a configuration UI.
>
> Signed-off-by: Andrew Wedgbury <andrew.wedgbury at realvnc.com>
> ---
>  src/screen-share.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/src/screen-share.c b/src/screen-share.c
> index d3e3f05..6f60b81 100644
> --- a/src/screen-share.c
> +++ b/src/screen-share.c
> @@ -1005,10 +1005,6 @@ weston_output_share(struct weston_output *output,
>         }
>
>         if (pid == 0) {
> -               /* We don't want anything circular */
> -               unsetenv("WAYLAND_DISPLAY");
> -               unsetenv("WAYLAND_SOCKET");
> -
>                 /* do not give our signal mask to the new process */
>                 sigfillset(&allsigs);
>                 sigprocmask(SIG_UNBLOCK, &allsigs, NULL);
> --
> 1.9.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/20140430/2caa3425/attachment.html>