From 9b059099542253c916c032d5df642c7691ff4cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Sat, 10 May 2014 10:43:34 +0200
Subject: [PATCH] desktop-shell: Fix order of desktop_shell messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There was a bug in wayland-scanner that failed to detect when an
message with implicitly set version (i.e. version 1) came after a
message with a newer version. This patch fixes the weston desktop shell
protocol to pass again.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
---
 protocol/desktop-shell.xml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/protocol/desktop-shell.xml b/protocol/desktop-shell.xml
index 65e44a73..fdcb17ba 100644
--- a/protocol/desktop-shell.xml
+++ b/protocol/desktop-shell.xml
@@ -33,17 +33,6 @@
       <arg name="surface" type="object" interface="wl_surface"/>
     </request>
 
-    <request name="desktop_ready" since="2">
-      <description summary="desktop is ready to be shown">
-	Tell the server, that enough desktop elements have been drawn
-	to make the desktop look ready for use. During start-up, the
-	server can wait for this request with a black screen before
-	starting to fade in the desktop, for instance. If the client
-	parts of a desktop take a long time to initialize, we avoid
-	showing temporary garbage.
-      </description>
-    </request>
-
     <!-- We'll fold most of wl_shell into this interface and then
          they'll share the configure event.  -->
     <event name="configure">
@@ -91,6 +80,20 @@
 
       <entry name="busy" value="11"/>
     </enum>
+
+    <!-- Version 2 additions -->
+
+    <request name="desktop_ready" since="2">
+      <description summary="desktop is ready to be shown">
+	Tell the server, that enough desktop elements have been drawn
+	to make the desktop look ready for use. During start-up, the
+	server can wait for this request with a black screen before
+	starting to fade in the desktop, for instance. If the client
+	parts of a desktop take a long time to initialize, we avoid
+	showing temporary garbage.
+      </description>
+    </request>
+
   </interface>
 
   <interface name="screensaver" version="1">