From: Evan Nemerson <evan@coeus-group.com>
Date: Tue, 17 Jan 2012 20:39:57 +0000 (-0800)
Subject: gio-2.0: re-add custom delegates for ActionEntry callbacks
X-Git-Tag: 0.15.1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0465851c97dc469a9dd0696e2e50c6e16bb394cc;p=thirdparty%2Fvala.git

gio-2.0: re-add custom delegates for ActionEntry callbacks
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index c9921fd05..c12e8e4e1 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -2568,10 +2568,10 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
 	public struct ActionEntry {
 		public weak string name;
-		public GLib.Callback activate;
+		public GLib.SimpleActionActivateCallback activate;
 		public weak string parameter_type;
 		public weak string state;
-		public GLib.Callback change_state;
+		public GLib.SimpleActionChangeStateCallback change_state;
 	}
 	[CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
 	public struct DBusErrorEntry {
@@ -3231,6 +3231,10 @@ namespace GLib {
 	public delegate GLib.Variant SettingsBindSetMapping (GLib.Value value, GLib.VariantType expected_type);
 	[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 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 ae65d0401..027ab12cc 100644
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -238,6 +238,8 @@ namespace GLib {
 		NO_FLAGS
 	}
 
+	public delegate void SimpleActionActivateCallback (SimpleAction action, Variant? parameter);
+	public delegate void SimpleActionChangeStateCallback (SimpleAction action, Variant value);
 	[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)]
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 86db61a14..731b3fb6a 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -51,8 +51,8 @@ dbus_error_* parent="GLib.DBusError" name="dbus_error_(.*)"
 dbus_address_get_for_bus_sync parent="GLib.BusType" name="get_address_sync"
 
 ActionEntry
-  .activate type="GLib.Callback"
-  .change_state type="GLib.Callback"
+  .activate type="GLib.SimpleActionActivateCallback"
+  .change_state type="GLib.SimpleActionChangeStateCallback"
 ActionGroup
   .query_action#virtual_method virtual
 Application.local_command_line