summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2015-02-13 14:02:02 +0800
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-02-27 14:59:43 +0200
commit5ba1e1d137b73c7d67a5894f0bc4abf538c8b4f0 (patch)
tree413fbbc057653beb3b2ab58dbdd36c5ce560af83
parentc7384a0c58777f9b3785e724e28088acc9af1892 (diff)
xdg-shell: Bump unstable version
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r--clients/simple-damage.c2
-rw-r--r--clients/simple-egl.c2
-rw-r--r--clients/simple-shm.c2
-rw-r--r--clients/window.c2
-rw-r--r--desktop-shell/shell.c2
-rw-r--r--protocol/xdg-shell.xml2
6 files changed, 6 insertions, 6 deletions
diff --git a/clients/simple-damage.c b/clients/simple-damage.c
index fe532fe2..c9dbc32e 100644
--- a/clients/simple-damage.c
+++ b/clients/simple-damage.c
@@ -642,7 +642,7 @@ static const struct xdg_shell_listener xdg_shell_listener = {
xdg_shell_ping,
};
-#define XDG_VERSION 4 /* The version of xdg-shell that we implement */
+#define XDG_VERSION 5 /* The version of xdg-shell that we implement */
#ifdef static_assert
static_assert(XDG_VERSION == XDG_SHELL_VERSION_CURRENT,
"Interface version doesn't match implementation version");
diff --git a/clients/simple-egl.c b/clients/simple-egl.c
index d3c205f0..3040caa0 100644
--- a/clients/simple-egl.c
+++ b/clients/simple-egl.c
@@ -741,7 +741,7 @@ static const struct xdg_shell_listener xdg_shell_listener = {
xdg_shell_ping,
};
-#define XDG_VERSION 4 /* The version of xdg-shell that we implement */
+#define XDG_VERSION 5 /* The version of xdg-shell that we implement */
#ifdef static_assert
static_assert(XDG_VERSION == XDG_SHELL_VERSION_CURRENT,
"Interface version doesn't match implementation version");
diff --git a/clients/simple-shm.c b/clients/simple-shm.c
index f810bbee..1df08be7 100644
--- a/clients/simple-shm.c
+++ b/clients/simple-shm.c
@@ -352,7 +352,7 @@ static const struct xdg_shell_listener xdg_shell_listener = {
xdg_shell_ping,
};
-#define XDG_VERSION 4 /* The version of xdg-shell that we implement */
+#define XDG_VERSION 5 /* The version of xdg-shell that we implement */
#ifdef static_assert
static_assert(XDG_VERSION == XDG_SHELL_VERSION_CURRENT,
"Interface version doesn't match implementation version");
diff --git a/clients/window.c b/clients/window.c
index 57f7a8d1..a04cef9c 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -5245,7 +5245,7 @@ static const struct xdg_shell_listener xdg_shell_listener = {
xdg_shell_ping,
};
-#define XDG_VERSION 4 /* The version of xdg-shell that we implement */
+#define XDG_VERSION 5 /* The version of xdg-shell that we implement */
#ifdef static_assert
static_assert(XDG_VERSION == XDG_SHELL_VERSION_CURRENT,
"Interface version doesn't match implementation version");
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index a61b27ce..bfc6a7bb 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4224,7 +4224,7 @@ xdg_shell_unversioned_dispatch(const void *implementation,
return 0;
}
-#define XDG_SERVER_VERSION 4
+#define XDG_SERVER_VERSION 5
static_assert(XDG_SERVER_VERSION == XDG_SHELL_VERSION_CURRENT,
"shell implementation doesn't match protocol version");
diff --git a/protocol/xdg-shell.xml b/protocol/xdg-shell.xml
index 2df2a1cb..3656e102 100644
--- a/protocol/xdg-shell.xml
+++ b/protocol/xdg-shell.xml
@@ -44,7 +44,7 @@
they implement using static_assert to ensure the protocol and
implementation versions match.
</description>
- <entry name="current" value="4" summary="Always the latest version"/>
+ <entry name="current" value="5" summary="Always the latest version"/>
</enum>
<enum name="error">