From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 9 Aug 2022 06:13:38 +0000 (+0200)
Subject: atspi-2: Fix a few binding errors
X-Git-Tag: 0.48.25~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9a2ce3d21d9cefd7a97ce2a219734a1ad671744;p=thirdparty%2Fvala.git

atspi-2: Fix a few binding errors
---

diff --git a/vapi/atspi-2.vapi b/vapi/atspi-2.vapi
index f2d8490a0..60f7b5ffd 100644
--- a/vapi/atspi-2.vapi
+++ b/vapi/atspi-2.vapi
@@ -118,9 +118,8 @@ namespace Atspi {
 	}
 	[CCode (cheader_filename = "atspi/atspi.h", type_id = "atspi_event_listener_get_type ()")]
 	public class EventListener : GLib.Object {
-		public weak Atspi.EventListenerCB callback;
-		public weak GLib.DestroyNotify cb_destroyed;
-		public void* user_data;
+		[CCode (delegate_target_cname = "user_data", destroy_notify_cname = "cb_destroyed")]
+		public Atspi.EventListenerCB callback;
 		[CCode (has_construct_function = false)]
 		public EventListener (owned Atspi.EventListenerCB callback);
 		public bool deregister (string event_type) throws GLib.Error;
@@ -430,9 +429,12 @@ namespace Atspi {
 	}
 	[CCode (cheader_filename = "atspi/atspi.h", has_type_id = false)]
 	public struct KeySet {
-		public uint keysyms;
-		public ushort keycodes;
-		public weak string keystrings;
+		[CCode (array_length_cname = "len", array_length_type = "gshort")]
+		public weak uint[] keysyms;
+		[CCode (array_length_cname = "len", array_length_type = "gshort")]
+		public weak ushort[] keycodes;
+		[CCode (array_length_cname = "len", array_length_type = "gshort")]
+		public weak string[] keystrings;
 		public short len;
 	}
 	[CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_CACHE_", type_id = "atspi_cache_get_type ()")]
@@ -791,9 +793,9 @@ namespace Atspi {
 		PARAGRAPH
 	}
 	[CCode (cheader_filename = "atspi/atspi.h", instance_pos = 1.9)]
-	public delegate bool DeviceListenerCB (owned Atspi.DeviceEvent stroke);
+	public delegate bool DeviceListenerCB (Atspi.DeviceEvent stroke);
 	[CCode (cheader_filename = "atspi/atspi.h", has_target = false)]
-	public delegate bool DeviceListenerSimpleCB (owned Atspi.DeviceEvent stroke);
+	public delegate bool DeviceListenerSimpleCB (Atspi.DeviceEvent stroke);
 	[CCode (cheader_filename = "atspi/atspi.h", instance_pos = 1.9)]
 	public delegate void EventListenerCB (owned Atspi.Event event);
 	[CCode (cheader_filename = "atspi/atspi.h", has_target = false)]
diff --git a/vapi/metadata/Atspi-2.0.metadata b/vapi/metadata/Atspi-2.0.metadata
index eec213c7a..9bfb723fb 100644
--- a/vapi/metadata/Atspi-2.0.metadata
+++ b/vapi/metadata/Atspi-2.0.metadata
@@ -5,7 +5,17 @@ DeviceEvent struct
 
 DeviceListener
 	.new_simple skip=false
+DeviceListenerCB.stroke owned=false
+DeviceListenerSimpleCB.stroke owned=false
 
 EventListener
 	.*_no_data skip=false
 	.new_simple skip=false
+	.callback unowned=false delegate_target_cname="user_data" destroy_notify_cname="cb_destroyed"
+	.cb_destroyed skip
+	.user_data skip
+
+KeySet
+	.keysyms array array_length_field="len"
+	.keycodes array array_length_field="len"
+	.keystrings array array_length_field="len"