[vala/staging] gio-2.0: Fix binding of Resolver.lookup_service*()

[Rico Tzschichholz <ricotz src gnome org>]

commit 0a17066ae18820f9410ebb7218725c60fe17cef8
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Sep 18 18:56:05 2016 +0200

    gio-2.0: Fix binding of Resolver.lookup_service*()

 vapi/gio-2.0.vapi                 |   14 ++++----------
 vapi/metadata/Gio-2.0-custom.vala |    7 -------
 vapi/metadata/Gio-2.0.metadata    |    5 ++---
 3 files changed, 6 insertions(+), 20 deletions(-)
---
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 1b8ddc0..8bda780 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1984,7 +1984,7 @@ namespace GLib {
                [NoAccessorMethod]
                public string uri { owned get; construct; }
        }
-       [CCode (cheader_filename = "gio/gio.h")]
+       [CCode (cheader_filename = "gio/gio.h", type_id = "g_resolver_get_type ()")]
        public class Resolver : GLib.Object {
                [CCode (has_construct_function = false)]
                protected Resolver ();
@@ -2003,15 +2003,9 @@ namespace GLib {
                [Version (since = "2.34")]
                public virtual async GLib.List<GLib.Variant> lookup_records_async (string rrname, 
GLib.ResolverRecordType record_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
                [Version (since = "2.22")]
-               public GLib.List<GLib.SrvTarget> lookup_service (string service, string protocol, string 
domain, GLib.Cancellable? cancellable = null) throws GLib.Error;
-               [CCode (finish_function = "g_resolver_lookup_service_finish")]
-               public async GLib.List<GLib.SrvTarget> lookup_service_async (string service, string protocol, 
string domain, GLib.Cancellable? cancellable = null) throws GLib.Error;
-               [CCode (vfunc_name = "lookup_service")]
-               [NoWrapper]
-               public virtual GLib.List<GLib.SrvTarget> lookup_service_fn (string rrname, GLib.Cancellable? 
cancellable = null) throws GLib.Error;
-               [CCode (finish_function = "g_resolver_lookup_service_finish", vfunc_name = 
"lookup_service_async")]
-               [NoWrapper]
-               public virtual async GLib.List<GLib.SrvTarget> lookup_service_fn_async (string rrname, 
GLib.Cancellable? cancellable = null);
+               public virtual GLib.List<GLib.SrvTarget> lookup_service (string service, string protocol, 
string domain, GLib.Cancellable? cancellable = null) throws GLib.Error;
+               [CCode (finish_vfunc_name = "lookup_service_finish", vfunc_name = "lookup_service_async")]
+               public virtual async GLib.List<GLib.SrvTarget> lookup_service_async (string rrname, 
GLib.Cancellable? cancellable = null) throws GLib.Error;
                [Version (since = "2.22")]
                public void set_default ();
                public virtual signal void reload ();
diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala
index 7db0f5d..32beefd 100644
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -134,13 +134,6 @@ namespace GLib {
                public void set_callback ([CCode (type = "GSourceFunc")] owned PollableSourceFunc func);
        }
 
-       public class Resolver : GLib.Object {
-               [CCode (finish_function = "g_resolver_lookup_service_finish")]
-               public async GLib.List<GLib.SrvTarget> lookup_service_async (string service, string protocol, 
string domain, GLib.Cancellable? cancellable = null) throws GLib.Error;
-               [NoWrapper, CCode (vfunc_name = "lookup_service_async", finish_function = 
"g_resolver_lookup_service_finish")]
-               public virtual async GLib.List<GLib.SrvTarget> lookup_service_fn_async (string rrname, 
GLib.Cancellable? cancellable = null);
-       }
-
        public class Settings : GLib.Object {
                [NoAccessorMethod]
                public GLib.SettingsBackend backend { owned get; construct; }
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index a67d691..c408469 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -177,9 +177,8 @@ PropertyAction
   .parameter_type skip
   .state_type skip
 Resolver
-  .lookup_service_async skip
-  .lookup_service#virtual_method skip=false name="lookup_service_fn" type="GLib.List<GLib.SrvTarget>"
-  .lookup_service_finish skip
+  .lookup_service#method virtual
+  .lookup_service_async#virtual_method vfunc_name="lookup_service_async" 
finish_vfunc_name="lookup_service_finish"
 Settings
   .change_event skip
   .get skip=false sentinel=""