From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 24 Sep 2016 11:19:42 +0000 (+0200)
Subject: gio-2.0: Use metadata instead of custom defintions for Initable
X-Git-Tag: 0.35.1~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=472b28214dc11b6579485427614cfe1fe2520759;p=thirdparty%2Fvala.git

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 026be60ce..0a5c6a795 100644
--- 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 5e62e4ad8..c2bbfc726 100644
--- 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 11455586f..fb00d3b92 100644
--- 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