From: Rico Tzschichholz Date: Wed, 9 Jan 2019 15:18:20 +0000 (+0100) Subject: atk: Don't use a custom SignalEmissionHook while it is part of gobject-2.0 X-Git-Tag: 0.43.5~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fa41b9e3a4d195be42efe87502c0ad0bc635ea9;p=thirdparty%2Fvala.git atk: Don't use a custom SignalEmissionHook while it is part of gobject-2.0 --- diff --git a/vapi/atk.vapi b/vapi/atk.vapi index fcb44e5c5..aeb811811 100644 --- a/vapi/atk.vapi +++ b/vapi/atk.vapi @@ -264,7 +264,7 @@ namespace Atk { [Version (deprecated = true, deprecated_since = "2.9.4")] 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 ([CCode (type = "GSignalEmissionHook")] Atk.SignalEmissionHook listener, string event_type); + public static uint add_global_event_listener (GLib.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")] @@ -958,8 +958,6 @@ namespace Atk { [CCode (cheader_filename = "atk/atk.h", has_target = false)] [Version (deprecated = true)] public delegate void PropertyChangeHandler (Atk.Object obj, Atk.PropertyValues vals); - [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", cname = "ATK_BINARY_AGE")] [Version (since = "2.7.4")] public const int BINARY_AGE; diff --git a/vapi/metadata/Atk-1.0-custom.vala b/vapi/metadata/Atk-1.0-custom.vala index f82bc919e..82a372713 100644 --- a/vapi/metadata/Atk-1.0-custom.vala +++ b/vapi/metadata/Atk-1.0-custom.vala @@ -13,7 +13,4 @@ namespace Atk { [CCode (array_length = false, array_null_terminated = true, cname = "atk_text_get_bounded_ranges")] public virtual Atk.TextRange[] get_bounded_ranges (Atk.TextRectangle rect, Atk.CoordType coord_type, Atk.TextClipType x_clip_type, Atk.TextClipType y_clip_type); } - - [CCode (cname = "GSignalEmissionHook", has_target = false)] - public delegate bool SignalEmissionHook (GLib.SignalInvocationHint ihint, [CCode (array_length_pos = 1.9)] Value[] param_values, void* data); } diff --git a/vapi/metadata/Atk-1.0.metadata b/vapi/metadata/Atk-1.0.metadata index b3c34c242..b704dc740 100644 --- a/vapi/metadata/Atk-1.0.metadata +++ b/vapi/metadata/Atk-1.0.metadata @@ -9,7 +9,6 @@ Rectangle struct // 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"