xdg-shell: bump experimental protocol version

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 <jstpierre@mecheye.net>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
dev
Pekka Paalanen 10 years ago
parent 42ebdda446
commit 71182aed84
  1. 2
      clients/simple-damage.c
  2. 2
      clients/simple-egl.c
  3. 2
      clients/simple-shm.c
  4. 2
      clients/window.c
  5. 2
      desktop-shell/shell.c
  6. 2
      protocol/xdg-shell.xml

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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>

Loading…
Cancel
Save