From: Evan Nemerson <evan@nemerson.com>
Date: Thu, 12 Jun 2014 03:52:49 +0000 (-0700)
Subject: gio-2.0: callbacks in ActionEntry must not have a target
X-Git-Tag: 0.25.1~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc9b711a9ecddbb4e68bb5ec1519eacc6da3f84a;p=thirdparty%2Fvala.git

gio-2.0: callbacks in ActionEntry must not have a target

Fixes bug 681896.
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index a0ee63633..baee21a0a 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -3653,10 +3653,10 @@ namespace GLib {
 	public delegate GLib.Variant SettingsBindSetMappingShared (GLib.Value value, GLib.VariantType expected_type, void* user_data);
 	[CCode (cheader_filename = "gio/gio.h", instance_pos = 2.9)]
 	public delegate bool SettingsGetMapping (GLib.Variant value, out void* result);
-	[CCode (cheader_filename = "gio/gio.h")]
-	public delegate void SimpleActionActivateCallback (GLib.SimpleAction action, GLib.Variant? parameter);
-	[CCode (cheader_filename = "gio/gio.h")]
-	public delegate void SimpleActionChangeStateCallback (GLib.SimpleAction action, GLib.Variant value);
+	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
+	public delegate void SimpleActionActivateCallback (GLib.SimpleAction action, GLib.Variant? parameter, void* user_data);
+	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
+	public delegate void SimpleActionChangeStateCallback (GLib.SimpleAction action, GLib.Variant value, void* user_data);
 	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
 	public delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable? cancellable = null);
 	[CCode (cheader_filename = "gio/gio.h", instance_pos = 2.9)]
diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala
index 824faa7d6..830466c96 100644
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -197,8 +197,10 @@ namespace GLib {
 		NO_FLAGS
 	}
 
-	public delegate void SimpleActionActivateCallback (SimpleAction action, Variant? parameter);
-	public delegate void SimpleActionChangeStateCallback (SimpleAction action, Variant value);
+	[CCode (has_target = false)]
+	public delegate void SimpleActionActivateCallback (SimpleAction action, Variant? parameter, void* user_data);
+	[CCode (has_target = false)]
+	public delegate void SimpleActionChangeStateCallback (SimpleAction action, Variant value, void* user_data);
 	[CCode (cheader_filename = "gio/gio.h", instance_pos = 6.9)]
 	public delegate GLib.Variant DBusInterfaceGetPropertyFunc (GLib.DBusConnection connection, string sender, string object_path, string interface_name, string property_name) throws GLib.Error;
 	[CCode (cheader_filename = "gio/gio.h", instance_pos = 7.9)]