vala r2191 - in trunk: . vapi vapi/packages/gstreamer-netbuffer-0.10 vapigen

[juergbi svn gnome org]

Author: juergbi
Date: Tue Dec 16 21:27:58 2008
New Revision: 2191
URL: http://svn.gnome.org/viewvc/vala?rev=2191&view=rev

Log:
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


Modified:
   trunk/ChangeLog
   trunk/vapi/gstreamer-netbuffer-0.10.vapi
   trunk/vapi/packages/gstreamer-netbuffer-0.10/gstreamer-netbuffer-0.10.metadata
   trunk/vapigen/valagidlparser.vala

Modified: trunk/vapi/gstreamer-netbuffer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-netbuffer-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-netbuffer-0.10.vapi	Tue Dec 16 21:27:58 2008
@@ -6,18 +6,18 @@
 	[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 {

Modified: trunk/vapi/packages/gstreamer-netbuffer-0.10/gstreamer-netbuffer-0.10.metadata
==============================================================================
--- trunk/vapi/packages/gstreamer-netbuffer-0.10/gstreamer-netbuffer-0.10.metadata	(original)
+++ trunk/vapi/packages/gstreamer-netbuffer-0.10/gstreamer-netbuffer-0.10.metadata	Tue Dec 16 21:27:58 2008
@@ -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"

Modified: trunk/vapigen/valagidlparser.vala
==============================================================================
--- trunk/vapigen/valagidlparser.vala	(original)
+++ trunk/vapigen/valagidlparser.vala	Tue Dec 16 21:27:58 2008
@@ -1069,13 +1069,13 @@
 		} 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) {