[weston,6/6] xdg-shell: Bump unstable version

Submitted by Jasper St. Pierre on Nov. 22, 2014, 8:28 p.m.

Details

Message ID 1416688110-21188-7-git-send-email-jstpierre@mecheye.net
State Accepted
Commit 5ba1e1d137b73c7d67a5894f0bc4abf538c8b4f0
Headers show

Not browsing as part of any series.

Commit Message

Jasper St. Pierre Nov. 22, 2014, 8:28 p.m.
---
 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(-)

Patch hide | download patch | download mbox

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 33e711c..8efa500 100644
--- a/clients/simple-egl.c
+++ b/clients/simple-egl.c
@@ -671,7 +671,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 c1cb386..5dd1902 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 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 f77617f..fcbafd3 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -5206,7 +5206,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 9a69657..917fdcb 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4067,7 +4067,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 3359cf7..6fbd8a6 100644
--- a/protocol/xdg-shell.xml
+++ b/protocol/xdg-shell.xml
@@ -49,7 +49,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">