[PATCH weston 17/17] xdg-shell: Bump unstable version to 6

[Bryce Harrington]

Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

On Tue, Apr 07, 2015 at 05:01:32PM +0800, Jonas Ådahl wrote:
> Signed-off-by: Jonas Ådahl <jadahl at gmail.com>
> ---
>  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 c9dbc32..ba249d9 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 5 /* The version of xdg-shell that we implement */
> +#define XDG_VERSION 6 /* 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 3040caa..eaea6a6 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 5 /* The version of xdg-shell that we implement */
> +#define XDG_VERSION 6 /* 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 1df08be..0c9eb96 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 5 /* The version of xdg-shell that we implement */
> +#define XDG_VERSION 6 /* 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 4d3ca6f..6ed3a97 100644
> --- a/clients/window.c
> +++ b/clients/window.c
> @@ -5229,7 +5229,7 @@ static const struct xdg_shell_listener xdg_shell_listener = {
>  	xdg_shell_ping,
>  };
>  
> -#define XDG_VERSION 5 /* The version of xdg-shell that we implement */
> +#define XDG_VERSION 6 /* 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 847e2d8..770a597 100644
> --- a/desktop-shell/shell.c
> +++ b/desktop-shell/shell.c
> @@ -4250,7 +4250,7 @@ xdg_shell_unversioned_dispatch(const void *implementation,
>  		return 0;
>  	}
>  
> -#define XDG_SERVER_VERSION 5
> +#define XDG_SERVER_VERSION 6
>  
>  	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 e233b8f..b9c456d 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="5" summary="Always the latest version"/>
> +      <entry name="current" value="6" summary="Always the latest version"/>
>      </enum>
>  
>      <enum name="error">
> -- 
> 2.1.4
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel