From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 19 Apr 2017 07:45:14 +0000 (+0200)
Subject: gio-2.0: Tweak metadata to avoid duplicated interface dependencies
X-Git-Tag: 0.37.1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=035cc0e4a0a8ae21c699e3064d8b8ec2227ccf74;p=thirdparty%2Fvala.git

gio-2.0: Tweak metadata to avoid duplicated interface dependencies
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index fc4db4474..2ac46b925 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -621,7 +621,7 @@ namespace GLib {
 	}
 	[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, GLib.AsyncInitable, GLib.Initable {
+	public class DBusConnection : GLib.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "g_dbus_connection_new", has_construct_function = false)]
 		public async DBusConnection (GLib.IOStream stream, string? guid, GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public uint add_filter (owned GLib.DBusMessageFilterFunction filter_function);
@@ -2315,7 +2315,7 @@ namespace GLib {
 		public void remove (string action_name);
 	}
 	[CCode (cheader_filename = "gio/gio.h", type_id = "g_simple_async_result_get_type ()")]
-	public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult, GLib.AsyncResult {
+	public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
 		[CCode (has_construct_function = false)]
 		public SimpleAsyncResult (GLib.Object? source_object, void* source_tag);
 		[Version (deprecated = true, deprecated_since = "2.46")]
diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala
index 85fb01df3..38f9b3d61 100644
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -32,7 +32,7 @@ namespace GLib {
 	}
 
 	[CCode (cheader_filename = "gio/gio.h", type_id = "g_dbus_connection_get_type ()")]
-	public class DBusConnection : GLib.Object, GLib.AsyncInitable, GLib.Initable {
+	public class DBusConnection : GLib.Object {
 		[CCode (cname = "g_dbus_connection_new", finish_function = "g_dbus_connection_new_finish")]
 		[Version (deprecated_since = "vala-0.36", replacement = "DBusConnection")]
 		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;
@@ -112,7 +112,7 @@ namespace GLib {
 		public void bind_with_mapping (string key, GLib.Object object, string property, GLib.SettingsBindFlags flags, GLib.SettingsBindGetMappingShared get_mapping, GLib.SettingsBindSetMappingShared set_mapping, void* user_data, GLib.DestroyNotify? notify);
 	}
 
-	public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
+	public class SimpleAsyncResult : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public SimpleAsyncResult (GLib.Object? source_object, void* source_tag);
 		[CCode (has_construct_function = false)]