gio-2.0: Cherry-pick some fixes from 0.38

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 1505588e4faef3f6124221ea550f7b1b684803a1..d3780d945b7a96bc2c261c1a980406260909931e 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -2600,10 +2600,10 @@ namespace GLib {
        public class SocketListener : GLib.Object {
                [CCode (has_construct_function = false)]
                public SocketListener ();
-               public GLib.SocketConnection accept (out unowned GLib.Object source_object = null, GLib.Cancellable? cancellable = null) throws GLib.Error;
-               public async GLib.SocketConnection accept_async (GLib.Cancellable? cancellable = null, out unowned GLib.Object source_object = null) throws GLib.Error;
-               public GLib.Socket accept_socket (out unowned GLib.Object source_object = null, GLib.Cancellable? cancellable = null) throws GLib.Error;
-               public async GLib.Socket accept_socket_async (GLib.Cancellable? cancellable = null, out unowned GLib.Object source_object = null) throws GLib.Error;
+               public GLib.SocketConnection accept (out unowned GLib.Object? source_object = null, GLib.Cancellable? cancellable = null) throws GLib.Error;
+               public async GLib.SocketConnection accept_async (GLib.Cancellable? cancellable = null, out unowned GLib.Object? source_object = null) throws GLib.Error;
+               public GLib.Socket accept_socket (out unowned GLib.Object? source_object = null, GLib.Cancellable? cancellable = null) throws GLib.Error;
+               public async GLib.Socket accept_socket_async (GLib.Cancellable? cancellable = null, out unowned GLib.Object? source_object = null) throws GLib.Error;
                public bool add_address (GLib.SocketAddress address, GLib.SocketType type, GLib.SocketProtocol protocol, GLib.Object? source_object, out GLib.SocketAddress effective_address) throws GLib.Error;
                [Version (since = "2.24")]
                public uint16 add_any_inet_port (GLib.Object? source_object) throws GLib.Error;
@@ -4511,7 +4511,7 @@ namespace GLib {
                [CCode (cheader_filename = "gio/gio.h")]
                public static bool register_error (GLib.Quark error_domain, int error_code, string dbus_error_name);
                [CCode (cheader_filename = "gio/gio.h")]
-               public static void register_error_domain (string error_domain_quark_name, size_t quark_volatile, GLib.DBusErrorEntry entries, uint num_entries);
+               public static void register_error_domain (string error_domain_quark_name, size_t quark_volatile, [CCode (array_length_cname = "num_entries", array_length_pos = 3.1, array_length_type = "guint")] GLib.DBusErrorEntry[] entries);
                [CCode (cheader_filename = "gio/gio.h")]
                public static bool strip_remote_error (GLib.Error error);
                [CCode (cheader_filename = "gio/gio.h")]