[vala] xcb: merge Xcb.GetPropertyReply and Xcb.GetPropertyReply

[Evan Nemerson <evann src gnome org>]

commit 2fd2faab0ef47031834999bf8bf68f658d5f3ffe
Author: Florian Brosch <flo brosch gmail com>
Date:   Fri Aug 29 04:50:01 2014 +0200

    xcb: merge Xcb.GetPropertyReply and Xcb.GetPropertyReply

 vapi/xcb.vapi |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/vapi/xcb.vapi b/vapi/xcb.vapi
index 6575492..bde9928 100644
--- a/vapi/xcb.vapi
+++ b/vapi/xcb.vapi
@@ -621,17 +621,6 @@ namespace Xcb {
        public struct GetPropertyCookie {
        }
 
-       [Compact]
-       [CCode (cname = "xcb_get_property_reply_t", ref_function = "", unref_function = "free")]
-       public class GetPropertyReply {
-               public uint8 format;
-               public AtomT type;
-               [CCode (cname = "xcb_get_property_value_length")]
-               public int32 value_length ();
-               [CCode (cname = "xcb_get_property_value")]
-               public unowned void *value ();
-       }
-
        [SimpleType]
        [IntegerType (rank = 9)]
        [CCode (cname = "xcb_intern_atom_cookie_t", has_type_id = false)]
@@ -1252,14 +1241,16 @@ namespace Xcb {
                }
        }
 
+       [Compact]
        [CCode (cname = "xcb_get_property_reply_t", ref_function = "", unref_function = "free")]
        public class GetPropertyReply {
-               public uint8 format;
-               public Atom type;
+               public AtomT type;
                public uint32 bytes_after;
                private uint32 value_len;
                [CCode (cname = "xcb_get_property_value")]
                public unowned void *value ();
+               [CCode (cname = "xcb_get_property_value_length")]
+               public int32 value_length ();
                public string value_as_string () {
                        GLib.assert (format == 8);
                        return "%.*s".printf (value_len, value ());