xcb: merge Xcb.GetPropertyReply and Xcb.GetPropertyReply

diff --git a/vapi/xcb.vapi b/vapi/xcb.vapi
index 6575492d8b1a09be25ae362b92e03d124b731401..bde992856201bb1bcdd3e21116a15c2a087bcfe2 100644 (file)
--- 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 ());