[PATCH libxcb] Fallback to TCP if no protocol is specified and the UNIX connection fails

[Jamey Sharp]

I've pushed this patch; thanks!

I'll let you and Jeremy sort out the libX11 side.

Jamey

On Sun, Feb 19, 2012 at 01:43:54PM +0100, Julien Cristau wrote:
> Signed-off-by: Julien Cristau <jcristau at debian.org>
> ---
>  src/xcb_util.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/src/xcb_util.c b/src/xcb_util.c
> index fde4f85..6d9efe0 100644
> --- a/src/xcb_util.c
> +++ b/src/xcb_util.c
> @@ -234,6 +234,11 @@ static int _xcb_open(const char *host, char *protocol, const int display)
>      fd = _xcb_open_unix(protocol, file);
>      free(file);
>  
> +    if (fd < 0 && !protocol && *host == '\0') {
> +	    unsigned short port = X_TCP_PORT + display;
> +	    fd = _xcb_open_tcp(host, protocol, port);
> +    }
> +
>      return fd;
>  #endif /* !_WIN32 */
>      return -1; /* if control reaches here then something has gone wrong */
> -- 
> 1.7.9
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120219/b38ee70a/attachment.pgp>