[vala/0.34] gio-2.0: Cherry-pick some fixes from 0.36

[Rico Tzschichholz <ricotz src gnome org>]

commit b91f133e131fc551f0565d21f5693beba86e5aaa
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Fri Oct 6 14:02:56 2017 +0200

    gio-2.0: Cherry-pick some fixes from 0.36

 vapi/gio-2.0.vapi                 |   12 ++++++------
 vapi/metadata/Gio-2.0-custom.vala |    7 ++++---
 vapi/metadata/Gio-2.0.metadata    |    2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index d3780d9..8ee73bc 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -613,7 +613,7 @@ namespace GLib {
                public signal bool allow_mechanism (string mechanism);
                public virtual signal bool authorize_authenticated_peer (GLib.IOStream stream, 
GLib.Credentials? credentials);
        }
-       [CCode (cheader_filename = "gio/gio.h")]
+       [CCode (cheader_filename = "gio/gio.h", type_id = "g_dbus_connection_get_type ()")]
        [Version (since = "2.26")]
        public class DBusConnection : GLib.Object, GLib.AsyncInitable, GLib.Initable {
                [CCode (has_construct_function = false)]
@@ -648,7 +648,7 @@ namespace GLib {
                public unowned string get_unique_name ();
                public bool is_closed ();
                [CCode (cname = "g_dbus_connection_new", finish_function = "g_dbus_connection_new_finish")]
-               public static async GLib.DBusConnection @new (GLib.IOStream stream, string guid, 
GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) 
throws GLib.Error;
+               public static async GLib.DBusConnection @new (GLib.IOStream stream, string? guid, 
GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) 
throws GLib.Error;
                [CCode (cname = "g_dbus_connection_new_for_address", finish_function = 
"g_dbus_connection_new_for_address_finish")]
                public static async GLib.DBusConnection new_for_address (string address, 
GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) 
throws GLib.Error;
                public uint register_object<T> (string object_path, T object) throws GLib.IOError;
@@ -867,7 +867,7 @@ namespace GLib {
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_dbus_object_manager_client_get_type ()")]
        [Version (since = "2.30")]
-       public class DBusObjectManagerClient : GLib.Object, GLib.AsyncInitable, GLib.DBusObjectManager, 
GLib.Initable, GLib.AsyncInitable, GLib.DBusObjectManager, GLib.Initable {
+       public class DBusObjectManagerClient : GLib.Object, GLib.AsyncInitable, GLib.DBusObjectManager, 
GLib.Initable {
                [CCode (has_construct_function = false)]
                protected DBusObjectManagerClient ();
                [CCode (has_construct_function = false, type = "GDBusObjectManager*")]
@@ -952,9 +952,9 @@ namespace GLib {
                public unowned GLib.DBusPropertyInfo @ref ();
                public void unref ();
        }
-       [CCode (cheader_filename = "gio/gio.h")]
+       [CCode (cheader_filename = "gio/gio.h", type_id = "g_dbus_proxy_get_type ()")]
        [Version (since = "2.26")]
-       public class DBusProxy : GLib.Object, GLib.AsyncInitable, GLib.DBusInterface, GLib.Initable, 
GLib.AsyncInitable, GLib.DBusInterface, GLib.Initable {
+       public class DBusProxy : GLib.Object, GLib.AsyncInitable, GLib.DBusInterface, GLib.Initable {
                [CCode (has_construct_function = false)]
                protected DBusProxy ();
                public async GLib.Variant call (string method_name, GLib.Variant? parameters, 
GLib.DBusCallFlags flags, int timeout_msec, GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -1989,7 +1989,7 @@ namespace GLib {
                public string uri { owned get; construct; }
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_resolver_get_type ()")]
-       public class Resolver : GLib.Object {
+       public abstract class Resolver : GLib.Object {
                [CCode (has_construct_function = false)]
                protected Resolver ();
                [Version (since = "2.22")]
diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala
index f3aa484..9f28762 100644
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -33,7 +33,7 @@ namespace GLib {
 
        public class DBusConnection : GLib.Object {
                [CCode (cname = "g_dbus_connection_new", finish_function = "g_dbus_connection_new_finish")]
-               public static async GLib.DBusConnection @new (GLib.IOStream stream, string guid, 
GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) 
throws GLib.Error;
+               public static async GLib.DBusConnection @new (GLib.IOStream stream, string? guid, 
GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) 
throws GLib.Error;
                [CCode (cname = "g_dbus_connection_new_for_address", finish_function = 
"g_dbus_connection_new_for_address_finish")]
                public static async GLib.DBusConnection @new_for_address (string address, 
GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) 
throws GLib.Error;
                public async T get_proxy<T> (string? name, string object_path, GLib.DBusProxyFlags flags = 0, 
GLib.Cancellable? cancellable = null) throws GLib.IOError; 
@@ -43,14 +43,15 @@ namespace GLib {
        }
 
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_dbus_object_manager_client_get_type ()")]
-       public class DBusObjectManagerClient : GLib.Object, GLib.AsyncInitable, GLib.DBusObjectManager, 
GLib.Initable {
+       public class DBusObjectManagerClient : GLib.Object {
                [CCode (cname = "g_dbus_object_manager_client_new", finish_function = 
"g_dbus_object_manager_client_new_finish")]
                public static async GLib.DBusObjectManagerClient @new (GLib.DBusConnection connection, 
GLib.DBusObjectManagerClientFlags flags, string name, string object_path, [CCode (delegate_target_pos = 
5.33333, destroy_notify_pos = 5.66667)] owned GLib.DBusProxyTypeFunc? get_proxy_type_func, GLib.Cancellable? 
cancellable = null) throws GLib.Error;
                [CCode (cname = "g_dbus_object_manager_client_new_for_bus", finish_function = 
"g_dbus_object_manager_client_new_for_bus_finish")]
                public static async GLib.DBusObjectManagerClient @new_for_bus (GLib.BusType bus_type, 
GLib.DBusObjectManagerClientFlags flags, string name, string object_path, [CCode (delegate_target_pos = 
5.33333, destroy_notify_pos = 5.66667)] owned GLib.DBusProxyTypeFunc? get_proxy_type_func, GLib.Cancellable? 
cancellable = null) throws GLib.Error;
        }
 
-       public class DBusProxy : GLib.Object, GLib.AsyncInitable, GLib.DBusInterface, GLib.Initable {
+       [CCode (cheader_filename = "gio/gio.h", type_id = "g_dbus_proxy_get_type ()")]
+       public class DBusProxy : GLib.Object {
                [CCode (cname = "g_dbus_proxy_new", finish_function = "g_dbus_proxy_new_finish")]
                public static async GLib.DBusProxy @new (GLib.DBusConnection connection, GLib.DBusProxyFlags 
flags, GLib.DBusInterfaceInfo? info, string? name, string object_path, string interface_name, 
GLib.Cancellable? cancellable = null) throws GLib.IOError;
                [CCode (cname = "g_dbus_proxy_new_for_bus", finish_function = 
"g_dbus_proxy_new_for_bus_finish")]
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 255c371..12168de 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -185,7 +185,7 @@ PropertyAction
   .name skip
   .parameter_type skip
   .state_type skip
-Resolver
+Resolver abstract
   .lookup_service#method virtual
   .lookup_service_async#virtual_method vfunc_name="lookup_service_async" 
finish_vfunc_name="lookup_service_finish"
 Settings