summaryrefslogtreecommitdiff
path: root/composite
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2007-07-03 14:47:19 -0700
committerKeith Packard <keithp@neko.keithp.com>2007-07-03 14:47:19 -0700
commitf106c04b627d9f57b38627971dc79c75129e66d6 (patch)
tree59e058158256e5050db0bbcd63dbaaef07a49940 /composite
parent4f88d68bdb90cc7d12170355105b4fd020acd306 (diff)
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.
Diffstat (limited to 'composite')
-rw-r--r--composite/compext.c6
1 files changed, 1 insertions, 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;