From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 14 Jan 2019 20:05:50 +0000 (+0100)
Subject: javascriptcoregtk-4.0: Fix GLib.Callback parameters which can't hold target
X-Git-Tag: 0.43.6~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad08aeb2f6b5d855cdcbe7c4ea2ef75da128da77;p=thirdparty%2Fvala.git

javascriptcoregtk-4.0: Fix GLib.Callback parameters which can't hold target
---

diff --git a/vapi/javascriptcoregtk-4.0.vapi b/vapi/javascriptcoregtk-4.0.vapi
index b3668dc2a..3b2c2eb37 100644
--- a/vapi/javascriptcoregtk-4.0.vapi
+++ b/vapi/javascriptcoregtk-4.0.vapi
@@ -155,11 +155,11 @@ namespace JSC {
 	public class Class : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Class ();
-		public JSC.Value add_constructor_variadic (string? name, [CCode (delegate_target_pos = 2.33333, destroy_notify_pos = 2.66667)] owned GLib.Callback callback, GLib.Type return_type);
-		public JSC.Value add_constructorv (string? name, [CCode (delegate_target_pos = 2.33333, destroy_notify_pos = 2.66667)] owned GLib.Callback callback, GLib.Type return_type, [CCode (array_length_cname = "n_parameters", array_length_pos = 3.5, array_length_type = "guint")] GLib.Type[]? parameter_types);
-		public void add_method_variadic (string name, [CCode (delegate_target_pos = 2.33333, destroy_notify_pos = 2.66667)] owned GLib.Callback callback, GLib.Type return_type);
-		public void add_methodv (string name, [CCode (delegate_target_pos = 2.33333, destroy_notify_pos = 2.66667)] owned GLib.Callback callback, GLib.Type return_type, [CCode (array_length_cname = "n_parameters", array_length_pos = 3.5, array_length_type = "guint")] GLib.Type[]? parameter_types);
-		public void add_property (string name, GLib.Type property_type, [CCode (scope = "async")] GLib.Callback? getter, [CCode (scope = "async")] GLib.Callback? setter, void* user_data, GLib.DestroyNotify? destroy_notify);
+		public JSC.Value add_constructor_variadic (string? name, GLib.Callback callback, void* user_data, GLib.DestroyNotify? destroy_notify, GLib.Type return_type);
+		public JSC.Value add_constructorv (string? name, GLib.Callback callback, void* user_data, GLib.DestroyNotify? destroy_notify, GLib.Type return_type, [CCode (array_length_cname = "n_parameters", array_length_pos = 5.5, array_length_type = "guint")] GLib.Type[]? parameter_types);
+		public void add_method_variadic (string name, GLib.Callback callback, void* user_data, GLib.DestroyNotify? destroy_notify, GLib.Type return_type);
+		public void add_methodv (string name, GLib.Callback callback, void* user_data, GLib.DestroyNotify? destroy_notify, GLib.Type return_type, [CCode (array_length_cname = "n_parameters", array_length_pos = 5.5, array_length_type = "guint")] GLib.Type[]? parameter_types);
+		public void add_property (string name, GLib.Type property_type, [CCode (scope = "async")] GLib.Callback? getter, GLib.Callback? setter, void* user_data, GLib.DestroyNotify? destroy_notify);
 		public unowned string get_name ();
 		public unowned JSC.Class get_parent ();
 		[NoAccessorMethod]
@@ -220,9 +220,9 @@ namespace JSC {
 		public JSC.Value constructor_callv ([CCode (array_length_cname = "n_parameters", array_length_pos = 0.5, array_length_type = "guint")] JSC.Value[]? parameters);
 		public JSC.Value function_callv ([CCode (array_length_cname = "n_parameters", array_length_pos = 0.5, array_length_type = "guint")] JSC.Value[]? parameters);
 		[CCode (has_construct_function = false)]
-		public Value.function_variadic (JSC.Context context, global::string? name, [CCode (delegate_target_pos = 3.33333, destroy_notify_pos = 3.66667)] owned GLib.Callback callback, GLib.Type return_type);
+		public Value.function_variadic (JSC.Context context, global::string? name, GLib.Callback callback, void* user_data, GLib.DestroyNotify? destroy_notify, GLib.Type return_type);
 		[CCode (has_construct_function = false)]
-		public Value.functionv (JSC.Context context, global::string? name, [CCode (delegate_target_pos = 3.33333, destroy_notify_pos = 3.66667)] owned GLib.Callback callback, GLib.Type return_type, [CCode (array_length_cname = "n_parameters", array_length_pos = 4.5, array_length_type = "guint")] GLib.Type[]? parameter_types);
+		public Value.functionv (JSC.Context context, global::string? name, GLib.Callback callback, void* user_data, GLib.DestroyNotify? destroy_notify, GLib.Type return_type, [CCode (array_length_cname = "n_parameters", array_length_pos = 6.5, array_length_type = "guint")] GLib.Type[]? parameter_types);
 		public unowned JSC.Context get_context ();
 		public bool is_array ();
 		public bool is_boolean ();
@@ -239,7 +239,7 @@ namespace JSC {
 		public Value.number (JSC.Context context, double number);
 		[CCode (has_construct_function = false)]
 		public Value.object (JSC.Context context, void* instance, JSC.Class? jsc_class);
-		public void object_define_property_accessor (global::string property_name, JSC.ValuePropertyFlags flags, GLib.Type property_type, [CCode (scope = "async")] GLib.Callback? getter, [CCode (scope = "async")] GLib.Callback? setter, void* user_data, GLib.DestroyNotify? destroy_notify);
+		public void object_define_property_accessor (global::string property_name, JSC.ValuePropertyFlags flags, GLib.Type property_type, [CCode (scope = "async")] GLib.Callback? getter, GLib.Callback? setter, void* user_data, GLib.DestroyNotify? destroy_notify);
 		public void object_define_property_data (global::string property_name, JSC.ValuePropertyFlags flags, JSC.Value? property_value);
 		public bool object_delete_property (global::string name);
 		[CCode (array_length = false, array_null_terminated = true)]
diff --git a/vapi/metadata/JavaScriptCore-4.0-custom.vala b/vapi/metadata/JavaScriptCore-4.0-custom.vala
index 42da6694c..5e53d20b0 100644
--- a/vapi/metadata/JavaScriptCore-4.0-custom.vala
+++ b/vapi/metadata/JavaScriptCore-4.0-custom.vala
@@ -159,10 +159,4 @@ namespace JS {
 }
 
 namespace JSC {
-	public class Class : GLib.Object {
-		public void add_property (string name, GLib.Type property_type, [CCode (scope = "async")] GLib.Callback? getter, [CCode (scope = "async")] GLib.Callback? setter, void* user_data, GLib.DestroyNotify? destroy_notify);
-	}
-	public class Value : GLib.Object {
-		public void object_define_property_accessor (global::string property_name, JSC.ValuePropertyFlags flags, GLib.Type property_type, [CCode (scope = "async")] GLib.Callback? getter, [CCode (scope = "async")] GLib.Callback? setter, void* user_data, GLib.DestroyNotify? destroy_notify);
-	}
 }
diff --git a/vapi/metadata/JavaScriptCore-4.0.metadata b/vapi/metadata/JavaScriptCore-4.0.metadata
index e46c40ef7..c410f2aa6 100644
--- a/vapi/metadata/JavaScriptCore-4.0.metadata
+++ b/vapi/metadata/JavaScriptCore-4.0.metadata
@@ -1,4 +1,12 @@
 Class
-  .add_property skip
+  .add_property.getter closure=-1 destroy=-1 owned=false
+  .add_property.setter closure=-1 destroy=-1 owned=false
+  .add_constructor_variadic.callback closure=-1 destroy=-1 owned=false
+  .add_constructorv.callback closure=-1 destroy=-1 owned=false
+  .add_method_variadic.callback closure=-1 destroy=-1 owned=false
+  .add_methodv.callback closure=-1 destroy=-1 owned=false
 Value
-  .object_define_property_accessor skip
+  .new_function_variadic.callback closure=-1 destroy=-1 owned=false
+  .new_functionv.callback closure=-1 destroy=-1 owned=false
+  .object_define_property_accessor.getter closure=-1 destroy=-1 owned=false
+  .object_define_property_accessor.setter closure=-1 destroy=-1 owned=false