From: Florian Brosch <flo.brosch@gmail.com>
Date: Fri, 29 Aug 2014 02:50:01 +0000 (+0200)
Subject: xcb: merge Xcb.GetPropertyReply and Xcb.GetPropertyReply
X-Git-Tag: 0.25.3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fd2faab0ef47031834999bf8bf68f658d5f3ffe;p=thirdparty%2Fvala.git

xcb: merge Xcb.GetPropertyReply and Xcb.GetPropertyReply
---

diff --git a/vapi/xcb.vapi b/vapi/xcb.vapi
index 6575492d8..bde992856 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 ());