From: Evan Nemerson <evan@coeus-group.com>
Date: Tue, 23 Oct 2012 23:07:24 +0000 (-0700)
Subject: atk: fix Util.add_global_event_listener callback type
X-Git-Tag: 0.19.0~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f49877d8a37771638f0a8b394c01a4e4da4e5c43;p=thirdparty%2Fvala.git

atk: fix Util.add_global_event_listener callback type

Fixes bug 685552.
---

diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index ff96f2841..a47737642 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -226,7 +226,7 @@ namespace Atk {
 		[CCode (cheader_filename = "atk/atk.h", cname = "atk_add_focus_tracker")]
 		public static uint add_focus_tracker (Atk.EventListener focus_tracker);
 		[CCode (cheader_filename = "atk/atk.h", cname = "atk_add_global_event_listener")]
-		public static uint add_global_event_listener (GLib.SignalEmissionHook listener, string event_type);
+		public static uint add_global_event_listener ([CCode (type = "GSignalEmissionHook")] Atk.SignalEmissionHook listener, string event_type);
 		[CCode (cheader_filename = "atk/atk.h", cname = "atk_add_key_event_listener")]
 		public static uint add_key_event_listener (Atk.KeySnoopFunc listener);
 		[CCode (cheader_filename = "atk/atk.h", cname = "atk_focus_tracker_init")]
@@ -774,6 +774,8 @@ namespace Atk {
 	public delegate int KeySnoopFunc (Atk.KeyEventStruct event);
 	[CCode (cheader_filename = "atk/atk.h", has_target = false)]
 	public delegate void PropertyChangeHandler (Atk.Object Param1, Atk.PropertyValues Param2);
+	[CCode (cheader_filename = "atk/atk.h", cname = "GSignalEmissionHook", has_target = false)]
+	public delegate bool SignalEmissionHook (GLib.SignalInvocationHint ihint, [CCode (array_length_pos = 1.9)] Atk.Value[] param_values, void* data);
 	[CCode (cheader_filename = "atk/atk.h")]
 	[Deprecated (replacement = "Atk.Util.add_focus_tracker", since = "vala-0.16")]
 	public static uint add_focus_tracker (Atk.EventListener focus_tracker);
diff --git a/vapi/metadata/Atk-1.0-custom.vala b/vapi/metadata/Atk-1.0-custom.vala
index b194222cf..22f9418d3 100644
--- a/vapi/metadata/Atk-1.0-custom.vala
+++ b/vapi/metadata/Atk-1.0-custom.vala
@@ -52,6 +52,8 @@ namespace Atk {
 	public delegate int KeySnoopFunc (Atk.KeyEventStruct event);
 	[CCode (has_target = false)]
 	public delegate void PropertyChangeHandler (Atk.Object Param1, Atk.PropertyValues Param2);
+	[CCode (cname = "GSignalEmissionHook", has_target = false)]
+	public delegate bool SignalEmissionHook (GLib.SignalInvocationHint ihint, [CCode (array_length_pos = 1.9)] Value[] param_values, void* data);
 
 	[Deprecated (replacement = "Atk.Util.add_focus_tracker", since = "vala-0.16")]
 	public static uint add_focus_tracker (Atk.EventListener focus_tracker);
diff --git a/vapi/metadata/Atk-1.0.metadata b/vapi/metadata/Atk-1.0.metadata
index de22f0a06..908de4997 100644
--- a/vapi/metadata/Atk-1.0.metadata
+++ b/vapi/metadata/Atk-1.0.metadata
@@ -19,6 +19,7 @@ Text.get_bounded_ranges skip
 // Move static methods into classes (mostly Util)
 add_focus_tracker parent="Atk.Util"
 add_global_event_listener parent="Atk.Util"
+  .listener type="Atk.SignalEmissionHook"
 add_key_event_listener parent="Atk.Util"
 focus_tracker_init parent="Atk.Util"
 focus_tracker_notify parent="Atk.Util"