[vala/staging: 2/3] gio-2.0: Fix InputMessage, InputVector, OutputMessage and OutputVector

[Rico Tzschichholz <ricotz src gnome org>]

commit a74df54b8811d7b4240c83c5a99655de2245d66f
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Oct 9 10:49:44 2016 +0200

    gio-2.0: Fix InputMessage, InputVector, OutputMessage and OutputVector
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769224

 vapi/gio-2.0.vapi              |   21 +++++++++++----------
 vapi/metadata/Gio-2.0.metadata |   12 ++++++++++++
 2 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index ce83603..69b057d 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -3802,36 +3802,37 @@ namespace GLib {
        [Version (since = "2.48")]
        public struct InputMessage {
                public weak GLib.SocketAddress address;
-               [CCode (array_length = false)]
+               [CCode (array_length_cname = "num_vectors", array_length_type = "guint")]
                public weak GLib.InputVector[] vectors;
                public uint num_vectors;
                public size_t bytes_received;
                public int flags;
-               [CCode (array_length = false)]
-               public weak GLib.SocketControlMessage[] control_messages;
-               public uint num_control_messages;
+               public GLib.SocketControlMessage*** control_messages;
+               public uint* num_control_messages;
        }
        [CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
        [Version (since = "2.22")]
        public struct InputVector {
-               public void* buffer;
+               [CCode (array_length_cname = "size", array_length_type = "gsize")]
+               public uint8[] buffer;
                public size_t size;
        }
        [CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
        [Version (since = "2.44")]
        public struct OutputMessage {
                public weak GLib.SocketAddress address;
-               public GLib.OutputVector vectors;
+               [CCode (array_length_cname = "num_vectors", array_length_type = "guint")]
+               public weak GLib.OutputVector[] vectors;
                public uint num_vectors;
                public uint bytes_sent;
-               [CCode (array_length = false)]
-               public weak GLib.SocketControlMessage[] control_messages;
-               public uint num_control_messages;
+               public GLib.SocketControlMessage*** control_messages;
+               public uint* num_control_messages;
        }
        [CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
        [Version (since = "2.22")]
        public struct OutputVector {
-               public void* buffer;
+               [CCode (array_length_cname = "size", array_length_type = "gsize")]
+               public weak uint8[] buffer;
                public size_t size;
        }
        [CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index bdb01ae..6929586 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -276,6 +276,18 @@ TlsFileDatabase
   .new nullable
 TlsServerConnection
   .new nullable
+InputMessage
+  .vectors array_length_field="num_vectors"
+  .control_messages type="GLib.SocketControlMessage***"
+  .num_control_messages type="uint*"
+InputVector
+  .buffer type="uint8[]" array_length_field="size"
+OutputMessage
+  .vectors array array_length_field="num_vectors"
+  .control_messages type="GLib.SocketControlMessage***"
+  .num_control_messages type="uint*"
+OutputVector
+  .buffer type="unowned uint8[]" array_length_field="size"
 DBusError errordomain
 DBusSubtreeEnumerateFunc unowned=false skip=false
 ReallocFunc skip=false