From f106c04b627d9f57b38627971dc79c75129e66d6 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 3 Jul 2007 14:47:19 -0700 Subject: [PATCH] Have Composite always report server version. It was reporting the lessor of the server and client versions, which doesn't make sense with the 0.4 semantic change in clipping. --- composite/compext.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/composite/compext.c b/composite/compext.c index 9cf6bfe2c..944f8d844 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -138,11 +138,7 @@ ProcCompositeQueryVersion (ClientPtr client) rep.minorVersion = stuff->minorVersion; } else { rep.majorVersion = SERVER_COMPOSITE_MAJOR; - if (stuff->majorVersion == SERVER_COMPOSITE_MAJOR && - stuff->minorVersion < SERVER_COMPOSITE_MINOR) - rep.minorVersion = stuff->minorVersion; - else - rep.minorVersion = SERVER_COMPOSITE_MINOR; + rep.minorVersion = SERVER_COMPOSITE_MINOR; } pCompositeClient->major_version = rep.majorVersion; pCompositeClient->minor_version = rep.minorVersion;