From: Evan Nemerson <evan@coeus-group.com>
Date: Sat, 30 Oct 2010 17:44:49 +0000 (-0700)
Subject: gio-2.0: Fix ownership of several callbacks
X-Git-Tag: 0.10.2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fc0d14cf3b7e6a4bdd89599ee34e51c7b9a7b07;p=thirdparty%2Fvala.git

gio-2.0: Fix ownership of several callbacks
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 7bba230ad..901054710 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -148,7 +148,7 @@ namespace GLib {
 	public class DBusConnection : GLib.Object, GLib.Initable, GLib.AsyncInitable {
 		[CCode (type = "void", has_construct_function = false)]
 		public async DBusConnection (GLib.IOStream stream, string guid, GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver observer, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public uint add_filter (GLib.DBusMessageFilterFunction filter_function, GLib.DestroyNotify user_data_free_func);
+		public uint add_filter (owned GLib.DBusMessageFilterFunction filter_function);
 		public async GLib.Variant call (string bus_name, string object_path, string interface_name, string method_name, GLib.Variant parameters, GLib.VariantType reply_type, GLib.DBusCallFlags flags, int timeout_msec, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public GLib.Variant call_sync (string bus_name, string object_path, string interface_name, string method_name, GLib.Variant parameters, GLib.VariantType reply_type, GLib.DBusCallFlags flags, int timeout_msec, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public void close (GLib.Cancellable? cancellable = null, GLib.AsyncReadyCallback callback);
@@ -733,8 +733,8 @@ namespace GLib {
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class IOSchedulerJob {
-		public bool send_to_mainloop (GLib.SourceFunc func, GLib.DestroyNotify? notify);
-		public void send_to_mainloop_async (GLib.SourceFunc func, GLib.DestroyNotify? notify);
+		public bool send_to_mainloop (owned GLib.SourceFunc func);
+		public void send_to_mainloop_async (owned GLib.SourceFunc func);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class IOStream : GLib.Object {
@@ -2406,7 +2406,7 @@ namespace GLib {
 	[CCode (cname = "g_io_scheduler_cancel_all_jobs", cheader_filename = "gio/gio.h")]
 	public static void g_io_scheduler_cancel_all_jobs ();
 	[CCode (cname = "g_io_scheduler_push_job", cheader_filename = "gio/gio.h")]
-	public static void g_io_scheduler_push_job (GLib.IOSchedulerJobFunc job_func, GLib.DestroyNotify? notify, int io_priority, GLib.Cancellable? cancellable = null);
+	public static void g_io_scheduler_push_job (owned GLib.IOSchedulerJobFunc job_func, int io_priority, GLib.Cancellable? cancellable = null);
 	[CCode (cname = "g_simple_async_report_error_in_idle", cheader_filename = "gio/gio.h")]
 	public static void g_simple_async_report_error_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, GLib.Quark domain, int code, string format);
 	[CCode (cname = "g_simple_async_report_gerror_in_idle", cheader_filename = "gio/gio.h")]
diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
index 7f814689d..1062d88d7 100644
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -35,6 +35,8 @@ g_data_input_stream_read_upto.length is_out="1"
 g_data_input_stream_read_upto_finish nullable="1" transfer_ownership="1"
 g_data_input_stream_read_upto_finish.length nullable="1" transfer_ownership="1" default_value="null" is_out="1"
 g_dbus_address_get_stream async="1"
+g_dbus_connection_add_filter.filter_function transfer_ownership="1"
+g_dbus_connection_add_filter.user_data_free_func hidden="1"
 g_dbus_connection_call async="1"
 g_dbus_connection_call_finish transfer_ownership="1"
 g_dbus_connection_call_sync transfer_ownership="1"
@@ -124,6 +126,12 @@ g_input_stream_read_all.bytes_read is_out="1"
 GIOErrorEnum rename_to="IOError" errordomain="1"
 g_io_extension_point_get_extensions type_arguments="IOExtension"
 g_io_modules_load_all_in_directory type_arguments="unowned TypeModule" transfer_ownership="1"
+g_io_scheduler_job_send_to_mainloop.func transfer_ownership="1"
+g_io_scheduler_job_send_to_mainloop.notify hidden="1"
+g_io_scheduler_job_send_to_mainloop_async.func transfer_ownership="1"
+g_io_scheduler_job_send_to_mainloop_async.notify hidden="1"
+g_io_scheduler_push_job.job_func transfer_ownership="1"
+g_io_scheduler_push_job.notify hidden="1"
 g_loadable_icon_load_async.cancellable nullable="1"
 g_memory_input_stream_add_data.destroy nullable="1"
 g_memory_input_stream_new_from_data.destroy nullable="1"