From: Pekka Paalanen <pekka.paala...@collabora.co.uk> The experimental versioning has not been updated when it was supposed to. Let's try to be better at it now, as xdg-shell is close to have its first stable version.
Bump the version now to bring the world into the same exact version. There may be some protocol changes still coming, but we try to land them before 1.6 gets out. Those changes will bump the experimental version again as needed. When 1.6.0 is released, the experimental version will no longer be bumped, and no incompatible protocol changes will be made. Xdg-shell.xml file will move to Wayland in 1.7.0, drop the experimental versioning, and become stable. Cc: Jasper St. Pierre <jstpie...@mecheye.net> Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk> --- clients/simple-damage.c | 2 +- clients/simple-egl.c | 2 +- clients/simple-shm.c | 2 +- clients/window.c | 2 +- desktop-shell/shell.c | 2 +- protocol/xdg-shell.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clients/simple-damage.c b/clients/simple-damage.c index d7a7c70..fe532fe 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 3 /* The version of xdg-shell that we implement */ +#define XDG_VERSION 4 /* 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 f23fb8c..69d28ea 100644 --- a/clients/simple-egl.c +++ b/clients/simple-egl.c @@ -670,7 +670,7 @@ static const struct xdg_shell_listener xdg_shell_listener = { xdg_shell_ping, }; -#define XDG_VERSION 3 /* The version of xdg-shell that we implement */ +#define XDG_VERSION 4 /* 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 29abb8b..b1c311f 100644 --- a/clients/simple-shm.c +++ b/clients/simple-shm.c @@ -321,7 +321,7 @@ static const struct xdg_shell_listener xdg_shell_listener = { xdg_shell_ping, }; -#define XDG_VERSION 3 /* The version of xdg-shell that we implement */ +#define XDG_VERSION 4 /* 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 90f45d3..5d64022 100644 --- a/clients/window.c +++ b/clients/window.c @@ -5103,7 +5103,7 @@ static const struct xdg_shell_listener xdg_shell_listener = { xdg_shell_ping, }; -#define XDG_VERSION 3 /* The version of xdg-shell that we implement */ +#define XDG_VERSION 4 /* 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 e3abaad..20536d7 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -3883,7 +3883,7 @@ xdg_shell_unversioned_dispatch(const void *implementation, return 0; } -#define XDG_SERVER_VERSION 3 +#define XDG_SERVER_VERSION 4 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 bd36231..275837f 100644 --- a/protocol/xdg-shell.xml +++ b/protocol/xdg-shell.xml @@ -45,7 +45,7 @@ they implement using static_assert to ensure the protocol and implementation versions match. </description> - <entry name="current" value="3" summary="Always the latest version"/> + <entry name="current" value="4" summary="Always the latest version"/> </enum> -- 1.8.5.5 _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel