[PATCH weston 10/10] xdg-shell: Bump unstable version

[Pekka Paalanen]

On Fri, 13 Feb 2015 14:02:02 +0800
Jonas Ådahl <jadahl at gmail.com> wrote:

> From: "Jasper St. Pierre" <jstpierre at mecheye.net>
> 
> ---
>  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 fe532fe..c9dbc32 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 d3c205f..3040caa 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 f810bbe..1df08be 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 57f7a8d..a04cef9 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 0ae2ad3..c28412f 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 f81fc4a..ea8a057 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">

Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

Jonas, would you like to push?


Thanks,
pq