glib2 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc1ca98ff2e2ca2540e4f14ca4e41233478bf4df2294003f32b53e628b40d2bb
-  data.tar.gz: 8d2318093b15b1489afd59c97df5a4e76df56a2b48eac599740b437882b74beb
+  metadata.gz: e7d1eb0a21b97c5152d4f792de24a5fc4c12074f1f38e1c0eb220d63e68c1adf
+  data.tar.gz: 792084386504df0ca97a1a8dcd0f5c5fae4cc0909ae93daf0699225d1a9bb52a
 SHA512:
-  metadata.gz: e5d71af62d76175a21f453b465917be4b495c286283278ffc533d7afa91f148fa872c27defdba8f2b2beee75b53c0bfb234e1b4c229c7b9d18eee83cfb0ea3f2
-  data.tar.gz: 7ee7bc7643e2d286d1eeff8c467236672f8939c12ffed17a58d891bb7f8f0eecc26e06935028414699a05024a4980691fea5b7b5ea5889299baf36d2867d9a23
+  metadata.gz: 68b6c0da8fac487e6267dfcf77b5695b838a8244702c241032f6a21a180cb7b9e403c642353efbec236d0fd5a2a9ffd6b6d241d85123fcc50038432b95599456
+  data.tar.gz: 7f369ff1a891dc192546b6c690ac819ad36610f13c3a69d68897607c41af214fb84d77312229c9c74c7777e9419c0ec06297d1c63939874c7d3e1deef015cf2c

data/ext/glib2/glib2.def

@@ -77,6 +77,8 @@ EXPORTS
 	g_rclosure_new_call
 	g_rclosure_attach
 	g_rclosure_attach_gobject
+	g_rclosure_detach
+	g_rclosure_detach_gobject
 	g_rclosure_set_tag
 	rbgobj_ruby_value_get_type
 	g_value_get_ruby_value

data/ext/glib2/rbglib.h

@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 #define RBGLIB_MAJOR_VERSION 4
 #define RBGLIB_MINOR_VERSION 0
-#define RBGLIB_MICRO_VERSION 1
+#define RBGLIB_MICRO_VERSION 2
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbgobj_closure.c

@@ -234,6 +234,8 @@ g_rclosure_new_raw(VALUE callback_proc,
                                                  rclosure);
     rclosure->tag[0]     = '\0';
 
+    g_closure_ref(closure);
+    g_closure_sink(closure);
     g_closure_set_marshal(closure, &rclosure_marshal);
     g_closure_add_finalize_notifier(closure, NULL, rclosure_finalize);
 
@@ -271,7 +273,10 @@ void
 g_rclosure_attach(GClosure *closure, VALUE object)
 {
     GRClosure *rclosure = (GRClosure *)closure;
-    rbgobj_add_relative(object, rclosure->rb_holder);
+    rbgobj_add_relative_removable(object,
+                                  Qnil,
+                                  id_closures,
+                                  rclosure->rb_holder);
 }
 
 void
@@ -286,6 +291,24 @@ g_rclosure_attach_gobject(GClosure *closure, VALUE object)
     rclosure->objects = g_list_prepend(rclosure->objects, gobject);
 }
 
+void
+g_rclosure_detach(GClosure *closure, VALUE object)
+{
+    GRClosure *rclosure = (GRClosure *)closure;
+    rbgobj_remove_relative(object, id_closures, rclosure->rb_holder);
+}
+
+void
+g_rclosure_detach_gobject(GClosure *closure, VALUE object)
+{
+    GRClosure *rclosure = (GRClosure *)closure;
+    g_rclosure_detach(closure, object);
+
+    GObject *gobject = RVAL2GOBJ(object);
+    g_object_weak_unref(gobject, rclosure_weak_notify, rclosure);
+    rclosure_weak_notify(rclosure, gobject);
+}
+
 void
 g_rclosure_set_tag(GClosure *closure, const gchar *tag)
 {
@@ -321,8 +344,6 @@ rg_initialize(VALUE self)
 {
     GClosure *closure = g_rclosure_new(rb_block_proc(), Qnil, NULL);
     G_INITIALIZE(self, closure);
-    g_closure_ref(closure);
-    g_closure_sink(closure);
     return self;
 }
 

data/ext/glib2/rbgobj_signal.c

@@ -23,6 +23,7 @@
 
 #define RG_TARGET_NAMESPACE cSignal
 
+static ID id_connected_closures;
 static VALUE RG_TARGET_NAMESPACE;
 VALUE rbgobj_signal_wrap(guint sig_id);
 
@@ -415,9 +416,19 @@ gobj_sig_connect_impl(gboolean after, int argc, VALUE *argv, VALUE self)
     g_free(tag);
     handler_id = g_signal_connect_closure_by_id(g_object, signal_id, detail,
                                                 rclosure, after);
-    g_closure_unref(rclosure);
+    VALUE rb_handler_id = ULONG2NUM(handler_id);
+    if (handler_id != 0) {
+        VALUE rb_connected_closures = rb_ivar_get(self, id_connected_closures);
+        if (NIL_P(rb_connected_closures)) {
+            rb_connected_closures = rb_hash_new();
+            rb_ivar_set(self, id_connected_closures, rb_connected_closures);
+        }
+        rb_hash_aset(rb_connected_closures,
+                     rb_handler_id,
+                     POINTER2NUM(rclosure));
+    }
 
-    return ULONG2NUM(handler_id);
+    return rb_handler_id;
 }
 
 static VALUE
@@ -604,6 +615,19 @@ static VALUE
 gobj_sig_handler_disconnect(VALUE self, VALUE id)
 {
     g_signal_handler_disconnect(RVAL2GOBJ(self), NUM2ULONG(id));
+    VALUE rb_connected_closures = rb_ivar_get(self, id_connected_closures);
+    if (NIL_P(rb_connected_closures)) {
+        return self;
+    }
+    VALUE rb_rclosure_pointer = rb_hash_aref(rb_connected_closures, id);
+    if (NIL_P(rb_rclosure_pointer)) {
+        return self;
+    }
+    GClosure *rclosure = NUM2POINTER(rb_rclosure_pointer);
+    if (!rclosure) {
+        return self;
+    }
+    g_rclosure_detach_gobject(rclosure, self);
     return self;
 }
 
@@ -971,6 +995,8 @@ rbgobj_define_action_methods(VALUE klass)
 void
 Init_gobject_gsignal(void)
 {
+    id_connected_closures = rb_intern("connected_closures");
+
     VALUE cSignalFlags, cSignalMatchType;
 
     RG_TARGET_NAMESPACE = rb_define_class_under(rbg_mGLib(), "Signal", rb_cObject);

data/ext/glib2/rbgobject.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2003-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2003-2022  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -238,6 +238,8 @@ extern GClosure* g_rclosure_new_call(VALUE callback_proc,
                                      RGClosureCallFunc func);
 extern void g_rclosure_attach(GClosure *closure, VALUE object);
 extern void g_rclosure_attach_gobject(GClosure *closure, VALUE object);
+extern void g_rclosure_detach(GClosure *closure, VALUE object);
+extern void g_rclosure_detach_gobject(GClosure *closure, VALUE object);
 extern void g_rclosure_set_tag(GClosure *closure, const gchar *tag);
 
 /* rbgobj_value.c */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config