gobject-introspection 4.3.5 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f2af585b545da84d885a67873cc350c86a5004a2eaa3a74d1f56fa6f5064577
-  data.tar.gz: 781aa916c1f1d68a8eb00218cf30d3089024bfb20e400af5537eaada9222a98c
+  metadata.gz: 14cd462d3b6126aa18b9f24dd4d7b2f463d7e4bca9aba7bd8f24936235cadfcc
+  data.tar.gz: c0d6260db2ec239fed19214d15a46f48d8cdec20e0da01d4c69d3cf330df84b1
 SHA512:
-  metadata.gz: 4cb99efc8147a0fd037676d0be908832db97e27723f1430b3d4aac0c1f0039ad9e72f3ed8aa6873ab1b5dfe4fb109afddc8a05969161aa8bc33065478a17912d
-  data.tar.gz: b9f38add02a025a1a7e6214fbaa34b9e2b9c0e92eabba6fcc515024bc629aa2818f3ca92aa6e956d6a136809644247a07d14da2664696e46553e89b4da9a0158
+  metadata.gz: 4e02b93e0319866f0c5d1635d0f1621fb1fdb6eb43fa30a6c14929ff16f1ebf65c1438babafeea8b8b688413feb976fa8b7cd0437d477988cc70aa80fb2d9759
+  data.tar.gz: 97f30ee234ae5e68397280d17346c58c1efcb6889683d509c62a6d5175008e10c42a5a4e1d78aaaaa90c29371f9a531f0a8dfe66f59862617ea246a7f5f7a78c

data/ext/gobject-introspection/rb-gi-callable-info.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2012-2026  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,134 @@
 
 #include "rb-gi-private.h"
 
+#ifdef HAVE_RUBY_THREAD_H
+#  include <ruby/thread.h>
+#  define RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_TYPE void *
+#  define RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_VALUE NULL
+#else
+#  define rb_thread_call_without_gvl(func, func_data, ubf, ubf_data) \
+    rb_thread_blocking_region(func, func_data, ubf, ubf_data)
+#  define RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_TYPE VALUE
+#  define RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_VALUE Qnil
+#endif
+
+typedef struct {
+    GICallableInfo *info;
+    GType implementor_gtype;
+    GArray *in_args;
+    GArray *out_args;
+    GIArgument return_value;
+    GError **error;
+    gboolean succeeded;
+} InvokeData;
+
+static void
+rb_gi_callable_info_invoke_raw_call(InvokeData *data)
+{
+    GIInfoType type = g_base_info_get_type((GIBaseInfo *)(data->info));
+    if (type == GI_INFO_TYPE_VFUNC) {
+        data->succeeded =
+            g_vfunc_info_invoke((GIVFuncInfo *)(data->info),
+                                data->implementor_gtype,
+                                (GIArgument *)((void *)(data->in_args->data)),
+                                data->in_args->len,
+                                (GIArgument *)((void *)(data->out_args->data)),
+                                data->out_args->len,
+                                &(data->return_value),
+                                data->error);
+    } else {
+        data->succeeded =
+            g_function_info_invoke((GIFunctionInfo *)(data->info),
+                                   (GIArgument *)((void *)(data->in_args->data)),
+                                   data->in_args->len,
+                                   (GIArgument *)((void *)(data->out_args->data)),
+                                   data->out_args->len,
+                                   &(data->return_value),
+                                   data->error);
+    }
+}
+
+static RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_TYPE
+rb_gi_callable_info_invoke_raw_call_without_gvl_body(void *user_data)
+{
+    InvokeData *data = (InvokeData *)user_data;
+
+    rb_gi_callable_info_invoke_raw_call(data);
+
+    return RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_VALUE;
+}
+
+VALUE
+rb_gi_callable_info_invoke_raw(GICallableInfo *info,
+                               VALUE rb_info,
+                               GType implementor_gtype,
+                               VALUE rb_receiver,
+                               VALUE rb_arguments,
+                               GIArgument *return_value,
+                               VALUE *rb_return_value)
+{
+    RBGIArguments args;
+    VALUE rb_out_args = Qnil;
+    gboolean succeeded;
+    GError *error = NULL;
+    gboolean lock_gvl = FALSE;
+
+    lock_gvl = RVAL2CBOOL(rb_funcall(rb_info,
+                                     rb_intern("lock_gvl?"),
+                                     1,
+                                     rb_receiver));
+    rb_arguments = rbg_to_array(rb_arguments);
+
+    rb_gi_arguments_init(&args, info, rb_receiver, rb_arguments, NULL);
+    {
+        InvokeData data;
+        data.info = info;
+        data.implementor_gtype = implementor_gtype;
+        data.in_args = args.in_args;
+        data.out_args = args.out_args;
+        data.error = &error;
+        if (lock_gvl) {
+            rb_gi_callable_info_invoke_raw_call(&data);
+        } else {
+            rb_thread_call_without_gvl(
+                rb_gi_callable_info_invoke_raw_call_without_gvl_body, &data,
+                NULL, NULL);
+        }
+        succeeded = data.succeeded;
+
+        if (return_value) {
+            *return_value = data.return_value;
+        }
+        if (rb_return_value) {
+            if (succeeded) {
+                *rb_return_value =
+                    rb_gi_arguments_convert_return_value(&args,
+                                                         &(data.return_value));
+            } else {
+                *rb_return_value = Qnil;
+            }
+        }
+    }
+
+    if (succeeded) {
+        rb_out_args = rb_gi_arguments_get_rb_out_args(&args);
+    }
+    rb_gi_arguments_clear(&args);
+    if (!succeeded) {
+        RG_RAISE_ERROR(error);
+    }
+
+    if (!NIL_P(rb_out_args) && RARRAY_LEN(rb_out_args) == 1) {
+        VALUE rb_out_arg;
+        rb_out_arg = RARRAY_AREF(rb_out_args, 0);
+        if (rb_obj_is_kind_of(rb_out_arg, rb_eException)) {
+            rb_exc_raise(rb_out_arg);
+        }
+    }
+
+    return rb_out_args;
+}
+
 #define RG_TARGET_NAMESPACE rb_cGICallableInfo
 #define SELF(self) RVAL2GI_CALLABLE_INFO(self)
 
@@ -35,6 +163,58 @@ gi_callable_info_get_type(void)
     return type;
 }
 
+static VALUE
+rg_set_lock_gvl_default(VALUE self, VALUE rb_boolean)
+{
+    return rb_iv_set(self, "lock_gvl_default", rb_boolean);
+}
+
+static VALUE
+rg_add_lock_gvl_predicate(VALUE self)
+{
+    VALUE rb_predicates;
+    if (!RVAL2CBOOL(rb_ivar_defined(self, rb_intern("lock_gvl_predicates")))) {
+        rb_predicates = rb_ary_new();
+        rb_iv_set(self, "lock_gvl_predicates", rb_predicates);
+    } else {
+        rb_predicates = rb_iv_get(self, "lock_gvl_predicates");
+    }
+    rb_ary_push(rb_predicates, rb_block_lambda());
+    return Qnil;
+}
+
+static VALUE
+rg_lock_gvl_p(int argc, VALUE *argv, VALUE self)
+{
+    VALUE rb_receiver;
+    VALUE rb_lock_gvl_default = Qtrue;
+    rb_scan_args(argc, argv, "01", &rb_receiver);
+    if (RVAL2CBOOL(rb_ivar_defined(self, rb_intern("lock_gvl_default")))) {
+        rb_lock_gvl_default = rb_iv_get(self, "lock_gvl_default");
+    }
+    if (NIL_P(rb_receiver)) {
+        return rb_lock_gvl_default;
+    }
+    if (!RVAL2CBOOL(rb_ivar_defined(self, rb_intern("lock_gvl_predicates")))) {
+        return rb_lock_gvl_default;
+    }
+    VALUE rb_predicates = rb_iv_get(self, "lock_gvl_predicates");
+    long n = RARRAY_LEN(rb_predicates);
+    long i;
+    VALUE rb_args = rb_ary_new_from_args(2,
+                                         self,
+                                         rb_receiver);
+    for (i = 0; i < n; i++) {
+        VALUE rb_predicate = RARRAY_PTR(rb_predicates)[n - i - 1];
+        VALUE rb_result = rb_proc_call(rb_predicate, rb_args);
+        if (NIL_P(rb_result)) {
+            continue;
+        }
+        return rb_result;
+    }
+    return rb_lock_gvl_default;
+}
+
 static VALUE
 rg_can_throw_gerror_p(VALUE self)
 {
@@ -98,6 +278,10 @@ rb_gi_callable_info_init(VALUE rb_mGI, VALUE rb_cGIBaseInfo)
         G_DEF_CLASS_WITH_PARENT(GI_TYPE_CALLABLE_INFO, "CallableInfo", rb_mGI,
                                 rb_cGIBaseInfo);
 
+    RG_DEF_METHOD(set_lock_gvl_default, 1);
+    RG_DEF_METHOD(add_lock_gvl_predicate, 0);
+    RG_DEF_METHOD_P(lock_gvl, -1);
+
     RG_DEF_METHOD_P(can_throw_gerror, 0);
     RG_DEF_METHOD(return_type, 0);
     RG_DEF_METHOD(caller_owns, 0);

data/ext/gobject-introspection/rb-gi-constructor-info.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2012-2026  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -124,8 +124,9 @@ rg_invoke(VALUE self, VALUE rb_receiver, VALUE rb_arguments)
         rb_raise(rb_eArgError, "receiver is missing");
     }
     /* TODO: use rb_protect */
-    rb_gi_function_info_invoke_raw(info,
+    rb_gi_callable_info_invoke_raw(info,
                                    self,
+                                   G_TYPE_NONE,
                                    Qnil,
                                    rb_arguments,
                                    &return_value,

data/ext/gobject-introspection/rb-gi-function-info.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2012-2026  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -20,17 +20,6 @@
 
 #include "rb-gi-private.h"
 
-#ifdef HAVE_RUBY_THREAD_H
-#  include <ruby/thread.h>
-#  define RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_TYPE void *
-#  define RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_VALUE NULL
-#else
-#  define rb_thread_call_without_gvl(func, func_data, ubf, ubf_data) \
-    rb_thread_blocking_region(func, func_data, ubf, ubf_data)
-#  define RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_TYPE VALUE
-#  define RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_VALUE Qnil
-#endif
-
 #define RG_TARGET_NAMESPACE rb_cGIFunctionInfo
 #define SELF(self) RVAL2GI_FUNCTION_INFO(self)
 
@@ -48,58 +37,6 @@ gi_function_info_get_type(void)
     return type;
 }
 
-static VALUE
-rg_set_lock_gvl_default(VALUE self, VALUE rb_boolean)
-{
-    return rb_iv_set(self, "lock_gvl_default", rb_boolean);
-}
-
-static VALUE
-rg_add_lock_gvl_predicate(VALUE self)
-{
-    VALUE rb_predicates;
-    if (!RVAL2CBOOL(rb_ivar_defined(self, rb_intern("lock_gvl_predicates")))) {
-        rb_predicates = rb_ary_new();
-        rb_iv_set(self, "lock_gvl_predicates", rb_predicates);
-    } else {
-        rb_predicates = rb_iv_get(self, "lock_gvl_predicates");
-    }
-    rb_ary_push(rb_predicates, rb_block_lambda());
-    return Qnil;
-}
-
-static VALUE
-rg_lock_gvl_p(int argc, VALUE *argv, VALUE self)
-{
-    VALUE rb_receiver;
-    VALUE rb_lock_gvl_default = Qtrue;
-    rb_scan_args(argc, argv, "01", &rb_receiver);
-    if (RVAL2CBOOL(rb_ivar_defined(self, rb_intern("lock_gvl_default")))) {
-        rb_lock_gvl_default = rb_iv_get(self, "lock_gvl_default");
-    }
-    if (NIL_P(rb_receiver)) {
-        return rb_lock_gvl_default;
-    }
-    if (!RVAL2CBOOL(rb_ivar_defined(self, rb_intern("lock_gvl_predicates")))) {
-        return rb_lock_gvl_default;
-    }
-    VALUE rb_predicates = rb_iv_get(self, "lock_gvl_predicates");
-    long n = RARRAY_LEN(rb_predicates);
-    long i;
-    VALUE rb_args = rb_ary_new_from_args(2,
-                                         self,
-                                         rb_receiver);
-    for (i = 0; i < n; i++) {
-        VALUE rb_predicate = RARRAY_PTR(rb_predicates)[n - i - 1];
-        VALUE rb_result = rb_proc_call(rb_predicate, rb_args);
-        if (NIL_P(rb_result)) {
-            continue;
-        }
-        return rb_result;
-    }
-    return rb_lock_gvl_default;
-}
-
 static VALUE
 rg_symbol(VALUE self)
 {
@@ -136,113 +73,6 @@ rg_vfunc(VALUE self)
     return GI_BASE_INFO2RVAL(g_function_info_get_vfunc(info));
 }
 
-typedef struct {
-    GIFunctionInfo *info;
-    GArray *in_args;
-    GArray *out_args;
-    GIArgument return_value;
-    GError **error;
-    gboolean succeeded;
-} InvokeData;
-
-static void
-rb_gi_function_info_invoke_raw_call(InvokeData *data)
-{
-    data->succeeded =
-        g_function_info_invoke(data->info,
-                               (GIArgument *)((void *)(data->in_args->data)),
-                               data->in_args->len,
-                               (GIArgument *)((void *)(data->out_args->data)),
-                               data->out_args->len,
-                               &(data->return_value),
-                               data->error);
-}
-
-static RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_TYPE
-rb_gi_function_info_invoke_raw_call_without_gvl_body(void *user_data)
-{
-    InvokeData *data = (InvokeData *)user_data;
-
-    rb_gi_function_info_invoke_raw_call(data);
-
-    return RB_THREAD_CALL_WITHOUT_GVL_FUNC_RETURN_VALUE;
-}
-
-VALUE
-rb_gi_function_info_invoke_raw(GIFunctionInfo *info,
-                               VALUE rb_info,
-                               VALUE rb_receiver,
-                               VALUE rb_arguments,
-                               GIArgument *return_value,
-                               VALUE *rb_return_value)
-{
-    GICallableInfo *callable_info;
-    RBGIArguments args;
-    VALUE rb_out_args = Qnil;
-    gboolean succeeded;
-    GError *error = NULL;
-    gboolean lock_gvl = FALSE;
-
-    lock_gvl = RVAL2CBOOL(rb_funcall(rb_info,
-                                     rb_intern("lock_gvl?"),
-                                     1,
-                                     rb_receiver));
-    rb_arguments = rbg_to_array(rb_arguments);
-
-    callable_info = (GICallableInfo *)info;
-    rb_gi_arguments_init(&args,
-                         callable_info,
-                         rb_receiver,
-                         rb_arguments,
-                         NULL);
-    {
-        InvokeData data;
-        data.info = info;
-        data.in_args = args.in_args;
-        data.out_args = args.out_args;
-        data.error = &error;
-        if (lock_gvl) {
-            rb_gi_function_info_invoke_raw_call(&data);
-        } else {
-            rb_thread_call_without_gvl(
-                rb_gi_function_info_invoke_raw_call_without_gvl_body, &data,
-                NULL, NULL);
-        }
-        succeeded = data.succeeded;
-
-        if (return_value) {
-            *return_value = data.return_value;
-        }
-        if (rb_return_value) {
-            if (succeeded) {
-                *rb_return_value =
-                    rb_gi_arguments_convert_return_value(&args,
-                                                         &(data.return_value));
-            } else {
-                *rb_return_value = Qnil;
-            }
-        }
-    }
-
-    if (succeeded) {
-        rb_out_args = rb_gi_arguments_get_rb_out_args(&args);
-    }
-    rb_gi_arguments_clear(&args);
-    if (!succeeded) {
-        RG_RAISE_ERROR(error);
-    }
-
-    if (!NIL_P(rb_out_args) && RARRAY_LEN(rb_out_args) == 1) {
-        VALUE rb_out_arg;
-        rb_out_arg = RARRAY_AREF(rb_out_args, 0);
-        if (rb_obj_is_kind_of(rb_out_arg, rb_eException)) {
-            rb_exc_raise(rb_out_arg);
-        }
-    }
-
-    return rb_out_args;
-}
-
 static VALUE
 rg_invoke(VALUE self, VALUE rb_arguments)
 {
@@ -251,9 +81,11 @@ rg_invoke(VALUE self, VALUE rb_arguments)
     VALUE rb_return_value;
 
     info = SELF(self);
+    GICallableInfo *callable_info = (GICallableInfo *)info;
     /* TODO: use rb_protect() */
-    rb_out_args = rb_gi_function_info_invoke_raw(info,
+    rb_out_args = rb_gi_callable_info_invoke_raw(callable_info,
                                                  self,
+                                                 G_TYPE_NONE,
                                                  Qnil,
                                                  rb_arguments,
                                                  NULL,
@@ -262,7 +94,6 @@ rg_invoke(VALUE self, VALUE rb_arguments)
     if (NIL_P(rb_out_args)) {
         return rb_return_value;
     } else {
-        GICallableInfo *callable_info = (GICallableInfo *)info;
         GITypeInfo return_value_info;
         g_callable_info_load_return_type(callable_info, &return_value_info);
         if (g_type_info_get_tag(&return_value_info) != GI_TYPE_TAG_VOID) {
@@ -283,10 +114,6 @@ rb_gi_function_info_init(VALUE rb_mGI, VALUE rb_cGICallableInfo)
 	G_DEF_CLASS_WITH_PARENT(GI_TYPE_FUNCTION_INFO, "FunctionInfo", rb_mGI,
 				rb_cGICallableInfo);
 
-    RG_DEF_METHOD(set_lock_gvl_default, 1);
-    RG_DEF_METHOD(add_lock_gvl_predicate, 0);
-    RG_DEF_METHOD_P(lock_gvl, -1);
-
     RG_DEF_METHOD(symbol, 0);
     RG_DEF_METHOD(flags, 0);
     RG_DEF_METHOD(property, 0);

data/ext/gobject-introspection/rb-gi-method-info.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2013  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2012-2026  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -43,10 +43,11 @@ rg_invoke(VALUE self, VALUE rb_receiver, VALUE rb_arguments)
     VALUE rb_return_value;
 
     info = SELF(self);
-
+    GICallableInfo *callable_info = (GICallableInfo *)info;
     /* TODO: use rb_protect */
-    rb_out_args = rb_gi_function_info_invoke_raw(info,
+    rb_out_args = rb_gi_callable_info_invoke_raw(callable_info,
                                                  self,
+                                                 G_TYPE_NONE,
                                                  rb_receiver,
                                                  rb_arguments,
                                                  NULL,
@@ -55,7 +56,6 @@ rg_invoke(VALUE self, VALUE rb_receiver, VALUE rb_arguments)
     if (NIL_P(rb_out_args)) {
         return rb_return_value;
     } else {
-        GICallableInfo *callable_info = (GICallableInfo *)info;
         GITypeInfo return_value_info;
         g_callable_info_load_return_type(callable_info, &return_value_info);
         if (g_type_info_get_tag(&return_value_info) != GI_TYPE_TAG_VOID) {

data/ext/gobject-introspection/rb-gi-private.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2012-2026  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -108,8 +108,9 @@ void rb_gi_unresolved_info_init      (VALUE rb_mGI,
 void rb_gi_repository_init           (VALUE rb_mGI);
 void rb_gi_loader_init               (VALUE rb_mGI);
 
-VALUE rb_gi_function_info_invoke_raw (GIFunctionInfo *info,
+VALUE rb_gi_callable_info_invoke_raw (GICallableInfo *info,
                                       VALUE rb_info,
+                                      GType implementor_gtype,
                                       VALUE rb_receiver,
                                       VALUE rb_arguments,
                                       GIArgument *return_value,

data/ext/gobject-introspection/rb-gi-vfunc-info.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2012-2026  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -71,6 +71,41 @@ rg_invoker(VALUE self)
     return GI_BASE_INFO2RVAL_WITH_UNREF(g_vfunc_info_get_invoker(info));
 }
 
+static VALUE
+rg_invoke(VALUE self,
+          VALUE rb_implementor_gtype,
+          VALUE rb_receiver,
+          VALUE rb_arguments)
+{
+    GIVFuncInfo *info = SELF(self);
+    GICallableInfo *callable_info = (GICallableInfo *)info;
+    GType implementor_gtype = rbgobj_gtype_from_ruby(rb_implementor_gtype);
+    VALUE rb_return_value;
+    /* TODO: use rb_protect */
+    VALUE rb_out_args = rb_gi_callable_info_invoke_raw(info,
+                                                       self,
+                                                       implementor_gtype,
+                                                       rb_receiver,
+                                                       rb_arguments,
+                                                       NULL,
+                                                       &rb_return_value);
+
+    if (NIL_P(rb_out_args)) {
+        return rb_return_value;
+    } else {
+        GITypeInfo return_value_info;
+        g_callable_info_load_return_type(callable_info, &return_value_info);
+        if (g_type_info_get_tag(&return_value_info) != GI_TYPE_TAG_VOID) {
+            rb_ary_unshift(rb_out_args, rb_return_value);
+        }
+        if (RARRAY_LEN(rb_out_args) == 1) {
+            return RARRAY_PTR(rb_out_args)[0];
+        } else {
+            return rb_out_args;
+        }
+    }
+}
+
 void
 rb_gi_vfunc_info_init(VALUE rb_mGI, VALUE rb_cGICallableInfo)
 {
@@ -86,6 +121,7 @@ rb_gi_vfunc_info_init(VALUE rb_mGI, VALUE rb_cGICallableInfo)
     RG_DEF_METHOD(offset, 0);
     RG_DEF_METHOD(signal, 0);
     RG_DEF_METHOD(invoker, 0);
+    RG_DEF_METHOD(invoke, 3);
 
     G_DEF_CLASS(G_TYPE_IV_FUNC_INFO_FLAGS, "VFuncInfoFlags", rb_mGI);
 }

data/lib/gobject-introspection/loader.rb

@@ -363,7 +363,7 @@ module GObjectIntrospection
           invokers = INITIALIZE_INVOKERS
           invokers.values.each do |invoker|
             catch do |tag|
-              invoker.invoke(self, arguments.dup, block, tag)
+              invoker.invoke(self, arguments.dup, block, abort_tag: tag)
               LOADER_CLASS.initialize_instance_post(self)
               return
             end
@@ -687,10 +687,12 @@ module GObjectIntrospection
         ensure_prepared if defined?(Ractor)
       end
 
-      def invoke(receiver, arguments, block, abort_tag=nil)
+      def invoke(receiver, arguments, block,
+                 abort_tag: nil,
+                 implementor_gtype: nil)
         ensure_prepared
 
-        if receiver and @function_info_p
+        if receiver and @info.class == FunctionInfo
           arguments.unshift(receiver)
         end
 
@@ -709,7 +711,12 @@ module GObjectIntrospection
         if block.nil? and @require_callback_p
           receiver.to_enum(@method_name, *arguments)
         else
-          if @function_info_p
+          if @info.class == VFuncInfo
+            return_value = @info.invoke(implementor_gtype,
+                                        receiver,
+                                        arguments,
+                                        &block)
+          elsif @info.class == FunctionInfo
             return_value = @info.invoke(arguments, &block)
           else
             return_value = @info.invoke(receiver, arguments, &block)
@@ -753,7 +760,6 @@ module GObjectIntrospection
           @in_arg_nil_indexes << i if may_be_null
         end
 
-        @function_info_p = (@info.class == FunctionInfo)
         @have_return_value_p = @info.have_return_value?
         @require_callback_p = @info.require_callback?
 
@@ -847,6 +853,20 @@ module GObjectIntrospection
         vtable_gtype = container.gtype
         if container.respond_to?(:class_struct)
           struct = container.class_struct
+          # This is for "super" in "virtual_do_XXX".
+          parent_gtype = implementor_gtype.parent
+          parent_class = parent_gtype.to_class
+          invoker = Invoker.new(info, name, "#{parent_class.name}\##{name}")
+          parent_vfunc_callable = Module.new
+          parent_vfunc_callable.define_method(name) do |*args, &block|
+            invoker.invoke(self, args, block, implementor_gtype: parent_gtype)
+          end
+          # If we use implementor_gtype.class.include here,
+          # GLib::Instantiatable.include calls this method
+          # recursively. We don't need to call any hook for this
+          # method. So we use the original Module.include here.
+          Module.method(:include).unbind.bind_call(implementor_gtype.to_class,
+                                                   parent_vfunc_callable)
         else
           return false unless implementor_gtype.type_is_a?(vtable_gtype)
           struct = container.iface_struct

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: 4.3.6
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: 4.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: 4.3.6
 description: Ruby/GObjectIntrospection provides bindings of GObject Introspection
   and a loader module that can generate dynamically Ruby bindings of any GObject C
   libraries
@@ -157,7 +157,7 @@ requirements:
 - 'system: gobject-introspection-1.0: macports: gobject-introspection'
 - 'system: gobject-introspection-1.0: msys2: gobject-introspection'
 - 'system: gobject-introspection-1.0: rhel: pkgconfig(gobject-introspection-1.0)'
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Ruby/GObjectIntrospection is a Ruby binding of GObject Introspection.
 test_files: []