diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-12-13 11:39:16 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-12-13 14:59:04 -0500 |
| commit | 128449dd6498a2f74c3770f89a9dae0f70e2b351 (patch) | |
| tree | b5beddcf1eaadfad1dbb1f76a1e235525a123255 | |
| parent | ec6087bf070131bc3a26848fb9fb840f09b0e19d (diff) | |
present: Don't use the major/minor version from the protocol headers
We want to advertise the version we implement, not the version the
protocol headers happen to describe.
Reviewed-by: Jasper St. Pierre <<jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | include/protocol-versions.h | 4 | ||||
| -rw-r--r-- | present/present_request.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/protocol-versions.h b/include/protocol-versions.h index 7fe61e0ff..fc428c8cf 100644 --- a/include/protocol-versions.h +++ b/include/protocol-versions.h @@ -67,6 +67,10 @@ #define SERVER_PANORAMIX_MAJOR_VERSION 1 #define SERVER_PANORAMIX_MINOR_VERSION 1 +/* Present */ +#define SERVER_PRESENT_MAJOR_VERSION 1 +#define SERVER_PRESENT_MINOR_VERSION 0 + /* RandR */ #define SERVER_RANDR_MAJOR_VERSION 1 #define SERVER_RANDR_MINOR_VERSION 4 diff --git a/present/present_request.c b/present/present_request.c index 095fa2daf..1064dcb3b 100644 --- a/present/present_request.c +++ b/present/present_request.c @@ -26,6 +26,7 @@ #include "present_priv.h" #include "randrstr.h" +#include <protocol-versions.h> static int proc_present_query_version(ClientPtr client) @@ -35,8 +36,8 @@ proc_present_query_version(ClientPtr client) .type = X_Reply, .sequenceNumber = client->sequence, .length = 0, - .majorVersion = PRESENT_MAJOR, - .minorVersion = PRESENT_MINOR + .majorVersion = SERVER_PRESENT_MAJOR_VERSION, + .minorVersion = SERVER_PRESENT_MINOR_VERSION }; REQUEST_SIZE_MATCH(xPresentQueryVersionReq); |