gio-2.0: Use metadata instead of custom defintions for Initable

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 026be60ce9922d4e77b8cd874722a3288e9c934b..0a5c6a79582f8bb5b45d1d9dfcb39d317dd8ddc0 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -3480,7 +3480,7 @@ namespace GLib {
                [NoWrapper]
                public virtual bool to_tokens (GLib.GenericArray<string> tokens, out int out_version);
        }
-       [CCode (cheader_filename = "gio/gio.h")]
+       [CCode (cheader_filename = "gio/gio.h", type_id = "g_initable_get_type ()")]
        [Version (since = "2.22")]
        public interface Initable : GLib.Object {
                public abstract bool init (GLib.Cancellable? cancellable = null) throws GLib.Error;

diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala
index 5e62e4ad83cf5b1257d456076718b8026d8aedb0..c2bbfc7262c8dd47c717cef8758caa2bedfc864a 100644 (file)
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -171,10 +171,6 @@ namespace GLib {
                public virtual GLib.Icon? from_tokens (string[] tokens, int version) throws GLib.Error;
        }
 
-       public interface Initable : GLib.Object {
-               public static GLib.Object @new (GLib.Type object_type, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
-       }
-
        [Flags]
        public enum ConverterFlags {
                [Version (deprecated_since = "vala-0.16", replacement = "ConverterFlags.NONE")]

diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 11455586f583c28202f9faee9b4af08a2e12059c..fb00d3b92727c346d7b741d15b1f28427227cd9a 100644 (file)
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -258,8 +258,10 @@ Icon
   .to_string nullable
   .to_tokens skip
 Initable
-  .new_valist skip=false
-  .newv type="GLib.Object"
+  .new* skip=false throws="GLib.Error"
+  .new throws="GLib.Error"
+  .new.error skip
+  .newv skip=false type="GLib.Object"
 PollableInputStream
   .create_source type="GLib.PollableSource"
   .read_nonblocking.buffer type="uint8[]" array_length_idx=1