gobject-introspection 3.4.6 → 3.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec68b3d114025ea94cc6822ae95955382bd477670237d0ff9756d51b73f5809
-  data.tar.gz: bb1d89f8b52098cf67682090f938c200bf4ad39c7ff2a0c586acff67b9cb93aa
+  metadata.gz: 8155698d93f3dd547669c6f99f8c190d43a28e78f8ae343a0b397afaec2039e0
+  data.tar.gz: 9b0a49644e299b1c3cd484bd5e005e85e19aa7a872fd2caf4b7048fe6f78f50e
 SHA512:
-  metadata.gz: 939c34fcaca4e950cd1aae46f18548d0ab6a4e606ff01008a36c746b7982ad29491792f24ca3f29fe4b76701e8faa95ad2738e5d7c2167a55023e15b2b73f8e7
-  data.tar.gz: 5306728767ad7e6aa519ba6c1f039929f4256472a89f408c867bb424904f6400705aae7bf9debf5459fd46e81f9b4f73a596dffd2e0104255b64075673feb961
+  metadata.gz: 30ebf17fa41a3040f6c7e8d6e754d755c62862be2a84ceb7d3c88aeeaaeef562ab375087bb0c52a0b61e7bf5a242f0d2123201aec9b195e691105ffeaa5562ee
+  data.tar.gz: c8691d7a0cf8f3f3eb5c3bb25db2c5ba52bc6b8ed047509f1803da745547514ea2dd4b332aa330f67703bd40c19fbca36c1bfdb569c65c2d32fafd4b38bd48fa

data/ext/gobject-introspection/rb-gi-arguments.c

@@ -508,7 +508,7 @@ rb_gi_arguments_fill_raw_out_gerror(RBGIArguments *args,
     gint n_args = g_callable_info_get_n_args(args->info);
     /* GError ** isn't listed in args. */
     GError **gerror = *((gpointer *)(args->raw_args[n_args]));
-    VALUE cGLibError = rb_const_get(mGLib, rb_intern("Error"));
+    VALUE cGLibErrorInfo = rb_const_get(mGLib, rb_intern("ErrorInfo"));
     if (NIL_P(rb_error)) {
         g_set_error(gerror,
                     RBG_RUBY_ERROR,
@@ -519,23 +519,22 @@ rb_gi_arguments_fill_raw_out_gerror(RBGIArguments *args,
         VALUE backtrace = rb_funcall(rb_error, rb_intern("backtrace"), 0);
         VALUE formatted_backtrace =
             rb_ary_join(backtrace, rb_str_new_cstr("  \n"));
-        if (CBOOL2RVAL(rb_obj_is_kind_of(rb_error, cGLibError))) {
+        GQuark gdomain = RBG_RUBY_ERROR;
+        gint gcode = RBG_RUBY_ERROR_UNKNOWN;
+        if (RVAL2CBOOL(rb_obj_is_kind_of(rb_error, cGLibErrorInfo))) {
             VALUE domain = rb_funcall(rb_error, rb_intern("domain"), 0);
             VALUE code = rb_funcall(rb_error, rb_intern("code"), 0);
-            g_set_error(gerror,
-                        g_quark_from_string(RVAL2CSTR(domain)),
-                        NUM2INT(code),
-                        "%s\n  %s\n",
-                        RVAL2CSTR(message),
-                        RVAL2CSTR(formatted_backtrace));
-        } else {
-            g_set_error(gerror,
-                        RBG_RUBY_ERROR,
-                        RBG_RUBY_ERROR_UNKNOWN,
-                        "%s\n  %s\n",
-                        RVAL2CSTR(message),
-                        RVAL2CSTR(formatted_backtrace));
+            if (!NIL_P(domain) && !NIL_P(code)) {
+                gdomain = g_quark_from_string(RVAL2CSTR(domain));
+                gcode = NUM2INT(code);
+            }
         }
+        g_set_error(gerror,
+                    gdomain,
+                    gcode,
+                    "%s\n  %s\n",
+                    RVAL2CSTR(message),
+                    RVAL2CSTR(formatted_backtrace));
     }
 }
 
@@ -544,7 +543,7 @@ rb_gi_arguments_fill_raw_result_interface(RBGIArguments *args,
                                           VALUE rb_result,
                                           gpointer raw_result,
                                           GITypeInfo *type_info,
-                                          G_GNUC_UNUSED GITransfer transfer /* TODO */,
+                                          GITransfer transfer,
                                           gboolean is_return_value)
 {
     GIBaseInfo *interface_info;
@@ -584,8 +583,37 @@ rb_gi_arguments_fill_raw_result_interface(RBGIArguments *args,
       }
       break;
     case GI_INFO_TYPE_FLAGS:
+        rb_raise(rb_eNotImpError,
+                 "TODO: %s::%s: out raw result(interface)[%s]: <%s>",
+                 g_base_info_get_namespace(args->info),
+                 g_base_info_get_name(args->info),
+                 g_info_type_to_string(interface_type),
+                 g_base_info_get_name(interface_info));
+        break;
     case GI_INFO_TYPE_OBJECT:
     case GI_INFO_TYPE_INTERFACE:
+      {
+          GObject *value = RVAL2GOBJ(rb_result);
+          GType gtype = g_registered_type_info_get_g_type(interface_info);
+          if (gtype != G_TYPE_NONE &&
+              !G_TYPE_CHECK_INSTANCE_TYPE(value, gtype)) {
+              rb_raise(rb_eArgError,
+                       "%s::%s: must return <%s> object: <%" PRIsVALUE ">",
+                       g_base_info_get_namespace(args->info),
+                       g_base_info_get_name(args->info),
+                       g_type_name(gtype),
+                       rb_result);
+          }
+          if (transfer == GI_TRANSFER_EVERYTHING) {
+              g_object_ref(value);
+          }
+          if (is_return_value) {
+              ffi_return_value->v_pointer = value;
+          } else {
+              *((gpointer *)raw_result) = value;
+          }
+      }
+      break;
     case GI_INFO_TYPE_CONSTANT:
         rb_raise(rb_eNotImpError,
                  "TODO: %s::%s: out raw result(interface)[%s]: <%s>",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 3.4.6
+  version: 3.4.7
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.6
+        version: 3.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.6
+        version: 3.4.7
 description: Ruby/GObjectIntrospection provides bindings of GObject Introspection
   and a loader module that can generate dynamically Ruby bindings of any GObject C
   libraries