gobject-introspection 3.2.8 → 3.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7213d8a13c2cd45d21596d404c17a9f3bea46dbadb2ba5e8760c977695d41d0
-  data.tar.gz: a7d12df78a07de72ed3eecf958787eaf047398c84bb53cf93a21638bb11a9031
+  metadata.gz: 917092e759a8742c56e050f7564bd36b76062ee4c732891e6670a74b824e3f93
+  data.tar.gz: 5ec4fc8c4ab4e4849d2e7f0545a287897dfe3efdc7da378f513244cb5d904dcb
 SHA512:
-  metadata.gz: 309702c449dc20eccff306ed969c55d2905fcc5c92b2f93bb13b9d8280973c98a753dc3280eab22911dff0539b82c5d85bf0126d8dabd50249eb51ec048746c9
-  data.tar.gz: 6f827b081c4ef531c1d34d2dfc2eedfe010ac6616be8c6615a491abb212c0ff21dd0ac08f870d8d9cec28df83fc998c0448cd62260bb1c44f67d0caa94ff75ce
+  metadata.gz: 81a9fc8d8357c45bb75b74e3db39b29583f1294bbda8ece4ae4f2a788bce83ddf883b3852b395d0174b2b8f481f30aff4af91da96e39896793518526a5187022
+  data.tar.gz: 2d90c21ce441298992cfb78de060d042bb0fe9ff94091023520f6b2ad60508ae9dccbf3384ee1cc6351078dfce6636a490041873c4f8cd8c0a9c8a0215c7443f

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2012-2018  Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -49,7 +49,7 @@ rg_value(VALUE self)
 {
     GIConstantInfo *info;
     GIArgument value;
-    gint value_size;
+    G_GNUC_UNUSED gint value_size;
     GITypeInfo *type_info;
     VALUE rb_value;
 

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

@@ -46,6 +46,7 @@ struct RBGICallbackData_ {
     RBGICallback *callback;
     RBGIArgMetadata *metadata;
     VALUE rb_callback;
+    GObject *owner;
 };
 
 static VALUE RG_TARGET_NAMESPACE;
@@ -303,18 +304,6 @@ fill_metadata(GPtrArray *args_metadata, GICallableInfo *info)
     fill_metadata_rb_arg_index(args_metadata);
 }
 
-static void
-callback_data_guard_from_gc(RBGICallbackData *callback_data)
-{
-    rbg_gc_guard(callback_data, callback_data->rb_callback);
-}
-
-static void
-callback_data_unguard_from_gc(RBGICallbackData *callback_data)
-{
-    rbg_gc_unguard(callback_data);
-}
-
 static void
 rb_gi_callback_free(RBGICallback *callback)
 {
@@ -325,13 +314,30 @@ rb_gi_callback_free(RBGICallback *callback)
     xfree(callback);
 }
 
+static void
+rb_gi_callback_data_weak_notify(gpointer data, GObject* where_the_object_was)
+{
+    RBGICallbackData *callback_data = data;
+    callback_data->owner = NULL;
+}
+
 void
 rb_gi_callback_data_free(RBGICallbackData *callback_data)
 {
     if (callback_data->callback) {
         rb_gi_callback_free(callback_data->callback);
     }
-    callback_data_unguard_from_gc(callback_data);
+    if (callback_data->owner) {
+        VALUE rb_owner;
+        g_object_weak_unref(callback_data->owner,
+                            rb_gi_callback_data_weak_notify,
+                            callback_data);
+        rb_owner = rbgobj_ruby_object_from_instance2(callback_data->owner,
+                                                     FALSE);
+        if (!NIL_P(rb_owner)) {
+            rbgobj_object_remove_relative(rb_owner, callback_data->rb_callback);
+        }
+    }
     xfree(callback_data->metadata);
     xfree(callback_data);
 }
@@ -349,7 +355,7 @@ rb_gi_callback_data_get_rb_callback(RBGICallbackData *callback_data)
 }
 
 static void
-destroy_notify(gpointer data)
+rb_gi_callback_data_destroy_notify(gpointer data)
 {
     RBGICallbackData *callback_data = data;
     rb_gi_callback_data_free(callback_data);
@@ -1087,7 +1093,10 @@ ffi_closure_callback(G_GNUC_UNUSED ffi_cif *cif,
 }
 
 static void
-in_callback_argument_from_ruby(RBGIArgMetadata *metadata, GArray *in_args)
+in_callback_argument_from_ruby(RBGIArgMetadata *metadata,
+                               GArray *in_args,
+                               VALUE self,
+                               VALUE rb_arguments)
 {
     gpointer callback_function;
     GIArgInfo *arg_info;
@@ -1140,17 +1149,27 @@ in_callback_argument_from_ruby(RBGIArgMetadata *metadata, GArray *in_args)
 
     if (closure_argument) {
         RBGICallbackData *callback_data;
+        VALUE rb_owner;
 
         callback_data = ALLOC(RBGICallbackData);
         callback_data->callback = callback;
         callback_data->metadata = metadata;
         callback_data->rb_callback = rb_block_proc();
-        callback_data_guard_from_gc(callback_data);
+        if (NIL_P(self)) {
+            rb_owner = rb_ary_entry(rb_arguments, 0);
+        } else {
+            rb_owner = self;
+        }
+        rbgobj_object_add_relative(rb_owner, callback_data->rb_callback);
+        callback_data->owner = RVAL2GOBJ(rb_owner);
+        g_object_weak_ref(callback_data->owner,
+                          rb_gi_callback_data_weak_notify,
+                          callback_data);
         closure_argument->v_pointer = callback_data;
     }
 
     if (destroy_argument) {
-        destroy_argument->v_pointer = destroy_notify;
+        destroy_argument->v_pointer = rb_gi_callback_data_destroy_notify;
     }
 }
 
@@ -1163,7 +1182,7 @@ in_argument_from_ruby(GICallableInfo *callable_info,
                       VALUE self)
 {
     if (metadata->callback_p && !metadata->destroy_p) {
-        in_callback_argument_from_ruby(metadata, in_args);
+        in_callback_argument_from_ruby(metadata, in_args, self, rb_arguments);
         return;
     }
 

data/lib/gobject-introspection/loader.rb

@@ -596,7 +596,7 @@ module GObjectIntrospection
     end
 
     def define_equal_style_setter(info, klass, method_name)
-      if /\Aset_/ =~ method_name and info.n_args == 1
+      if /\Aset_/ =~ method_name and info.n_in_args == 1
         setter_method_name = "#{$POSTMATCH}="
         remove_existing_method(klass, setter_method_name)
         klass.__send__(:alias_method, setter_method_name, method_name)

metadata

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