From: Jürg Billeter <j@bitron.ch>
Date: Tue, 16 Dec 2008 21:27:58 +0000 (+0000)
Subject: Fix handling of int16, uint16, int32, and uint32
X-Git-Tag: VALA_0_5_3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd86029f60595d086f84cecd205b6811b6567f2;p=thirdparty%2Fvala.git

Fix handling of int16, uint16, int32, and uint32

2008-12-16  Jürg Billeter  <j@bitron.ch>

	* vapigen/valagidlparser.vala:

	Fix handling of int16, uint16, int32, and uint32

	* vapi/packages/gstreamer-netbuffer-0.10/:

	Fix gst_netaddress_get_ip4_address binding, patch by Evan Nemerson,
	fixes bug 564676

	* vapi/gstreamer-netbuffer-0.10.vapi: regenerated

svn path=/trunk/; revision=2191
---

diff --git a/ChangeLog b/ChangeLog
index 194a0e887..d694ba601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-12-16  Jürg Billeter  <j@bitron.ch>
+
+	* vapigen/valagidlparser.vala:
+
+	Fix handling of int16, uint16, int32, and uint32
+
+	* vapi/packages/gstreamer-netbuffer-0.10/:
+
+	Fix gst_netaddress_get_ip4_address binding, patch by Evan Nemerson,
+	fixes bug 564676
+
+	* vapi/gstreamer-netbuffer-0.10.vapi: regenerated
+
 2008-12-16  Jürg Billeter  <j@bitron.ch>
 
 	* vapi/packages/gstreamer-netbuffer-0.10/:
diff --git a/vapi/gstreamer-netbuffer-0.10.vapi b/vapi/gstreamer-netbuffer-0.10.vapi
index e72fb2d6b..4b1867ee6 100644
--- a/vapi/gstreamer-netbuffer-0.10.vapi
+++ b/vapi/gstreamer-netbuffer-0.10.vapi
@@ -6,18 +6,18 @@ namespace Gst {
 	[CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
 	public class NetAddress {
 		public void* address;
-		public ushort port;
+		public uint16 port;
 		public Gst.NetType type;
 		[CCode (cname = "gst_netaddress_get_ip4_address")]
-		public bool get_ip4_address (uint address, ushort port);
+		public bool get_ip4_address (out uint32 address, out uint16 port);
 		[CCode (cname = "gst_netaddress_get_ip6_address")]
-		public bool get_ip6_address (uchar[] address, ushort port);
+		public bool get_ip6_address (uchar[] address, out uint16 port);
 		[CCode (cname = "gst_netaddress_get_net_type")]
 		public Gst.NetType get_net_type ();
 		[CCode (cname = "gst_netaddress_set_ip4_address")]
-		public void set_ip4_address (uint address, ushort port);
+		public void set_ip4_address (uint32 address, uint16 port);
 		[CCode (cname = "gst_netaddress_set_ip6_address")]
-		public void set_ip6_address (uchar[] address, ushort port);
+		public void set_ip6_address (uchar[] address, uint16 port);
 	}
 	[CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
 	public class NetBuffer : Gst.Buffer {
diff --git a/vapi/packages/gstreamer-netbuffer-0.10/gstreamer-netbuffer-0.10.metadata b/vapi/packages/gstreamer-netbuffer-0.10/gstreamer-netbuffer-0.10.metadata
index 6b1deb39a..f8ccdb528 100644
--- a/vapi/packages/gstreamer-netbuffer-0.10/gstreamer-netbuffer-0.10.metadata
+++ b/vapi/packages/gstreamer-netbuffer-0.10/gstreamer-netbuffer-0.10.metadata
@@ -1,2 +1,5 @@
 Gst cprefix="Gst" lower_case_cprefix="gst_" cheader_filename="gst/netbuffer/gstnetbuffer.h"
 GstNetBuffer base_class="GstBuffer"
+gst_netaddress_get_ip4_address.address is_out="1"
+gst_netaddress_get_ip4_address.port is_out="1"
+gst_netaddress_get_ip6_address.port is_out="1"
diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index a41da99eb..5b16b34ff 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -1069,13 +1069,13 @@ public class Vala.GIdlParser : CodeVisitor {
 		} else if (type_node.tag == TypeTag.UINT8) {
 			type.unresolved_symbol = new UnresolvedSymbol (null, "uchar");
 		} else if (type_node.tag == TypeTag.INT16) {
-			type.unresolved_symbol = new UnresolvedSymbol (null, "short");
+			type.unresolved_symbol = new UnresolvedSymbol (null, "int16");
 		} else if (type_node.tag == TypeTag.UINT16) {
-			type.unresolved_symbol = new UnresolvedSymbol (null, "ushort");
+			type.unresolved_symbol = new UnresolvedSymbol (null, "uint16");
 		} else if (type_node.tag == TypeTag.INT32) {
-			type.unresolved_symbol = new UnresolvedSymbol (null, "int");
+			type.unresolved_symbol = new UnresolvedSymbol (null, "int32");
 		} else if (type_node.tag == TypeTag.UINT32) {
-			type.unresolved_symbol = new UnresolvedSymbol (null, "uint");
+			type.unresolved_symbol = new UnresolvedSymbol (null, "uint32");
 		} else if (type_node.tag == TypeTag.INT64) {
 			type.unresolved_symbol = new UnresolvedSymbol (null, "int64");
 		} else if (type_node.tag == TypeTag.UINT64) {