[PATCH wayland 3/6 v2] protocol: Fix order of wl_pointer, wl_keyboard and wl_touch messages

[Jonas Ådahl]

The "release" message of wl_pointer, wl_keyboard and wl_touch introduced
in version 3 was placed first in the respective interface XML element,
causing wayland-scanner to misbehave and set the version number of the
"release" message to all subsequent messages with no explicitly specified
"since" version.

Signed-off-by: Jonas Ådahl <jadahl at gmail.com>
---

Fixed typo in commit subject and changed the wording of the commit
message a bit. The content of the patch is identical to v1.

Jonas


 protocol/wayland.xml | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/protocol/wayland.xml b/protocol/wayland.xml
index 330f8ab..22eb6e7 100644
--- a/protocol/wayland.xml
+++ b/protocol/wayland.xml
@@ -1384,10 +1384,6 @@
       <arg name="hotspot_y" type="int" summary="y coordinate in surface-relative coordinates"/>
     </request>
 
-    <request name="release" type="destructor" since="3">
-      <description summary="release the pointer object"/>
-    </request>
-
     <event name="enter">
       <description summary="enter event">
 	Notification that this seat's pointer is focused on a certain
@@ -1485,6 +1481,13 @@
       <arg name="axis" type="uint"/>
       <arg name="value" type="fixed"/>
     </event>
+
+    <!-- Version 3 additions -->
+
+    <request name="release" type="destructor" since="3">
+      <description summary="release the pointer object"/>
+    </request>
+
   </interface>
 
   <interface name="wl_keyboard" version="3">
@@ -1493,10 +1496,6 @@
       associated with a seat.
     </description>
 
-    <request name="release" type="destructor" since="3">
-      <description summary="release the keyboard object"/>
-    </request>
-
     <enum name="keymap_format">
       <description summary="keyboard mapping format">
 	This specifies the format of the keymap provided to the
@@ -1573,6 +1572,12 @@
       <arg name="mods_locked" type="uint"/>
       <arg name="group" type="uint"/>
     </event>
+
+    <!-- Version 3 additions -->
+
+    <request name="release" type="destructor" since="3">
+      <description summary="release the keyboard object"/>
+    </request>
   </interface>
 
   <interface name="wl_touch" version="3">
@@ -1587,10 +1592,6 @@
       contact point can be identified by the ID of the sequence.
     </description>
 
-    <request name="release" type="destructor" since="3">
-      <description summary="release the touch object"/>
-    </request>
-
     <event name="down">
       <description summary="touch down event and beginning of a touch sequence">
 	A new touch point has appeared on the surface. This touch point is
@@ -1643,6 +1644,12 @@
 	this surface may re-use the touch point ID.
       </description>
     </event>
+
+    <!-- Version 3 additions -->
+
+    <request name="release" type="destructor" since="3">
+      <description summary="release the touch object"/>
+    </request>
   </interface>
 
   <interface name="wl_output" version="2">
-- 
1.9.1