glib2 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66272eed88affb94e6450b2c6fc3e709170550c8128f655c7a04525ce500c1e2
-  data.tar.gz: 3bf5c4b58db2710958f944a19c64a241533782a3426750c1730f0b698d2299cb
+  metadata.gz: 5331e6475207502d9e0a2566b7728c09fd95ac83d821b62ea247406bfb47c789
+  data.tar.gz: 7ff90ee993333fdd7b4375d0b29665d4f96219442e3bf487483d80874d70378e
 SHA512:
-  metadata.gz: f2cc24a9b32995fe0b103b791fd8125440e57f4df461223d18a6ea78455b8636bbb85dde69fbd369e066eead8512883e102b2161aef19aa63be2837fe6ba8ee2
-  data.tar.gz: 75752d24af34f8e581881a7174d4396b8da667a899e70a3af069fef6d8729fc3e87faa10b633511a58c461f3a2653761932eb528b21f1e7a65db223573df1e11
+  metadata.gz: a40c45a76f008b275952f8d10804cc492849c498ee7e2ee2be60d70e22490ecb4051073d83a1435d176fcfea7df45885c80ba45443511aa45191b784bdbdaf3c
+  data.tar.gz: f1ffa68a21cb316a092b43deb23b6cd9a851bdd6a56208875c4fc98b31cacf4572f329cf2635b5b596ab024a72910ef48b0e9419343b2a162932a53f6bf4634e

data/ext/glib2/glib2.def

@@ -63,6 +63,7 @@ EXPORTS
 	rbgobj_register_type
 	rbgobj_object_alloc_func
 	rbgobj_object_add_relative
+	rbgobj_gobject_remove_relative
 	rbgobj_object_remove_relative
 	rbgobj_object_remove_relatives
 	rbgobj_set_signal_func

data/ext/glib2/rbglib.h

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

data/ext/glib2/rbgobj_closure.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2002-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2002-2023  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 
 #define RG_TARGET_NAMESPACE cClosure
 
-static ID id_call, id_closures;
+static ID id_call;
 static gboolean rclosure_initialized = FALSE;
 
 #define TAG_SIZE 64
@@ -155,6 +155,7 @@ rclosure_marshal(GClosure*       closure,
     G_PROTECT_CALLBACK(rclosure_marshal_do, &arg);
 }
 
+static void g_rclosure_detach_raw_gobject(GClosure *closure, GObject *gobject);
 static void rclosure_weak_notify(gpointer data, GObject* where_the_object_was);
 
 static void
@@ -165,12 +166,11 @@ rclosure_invalidate(G_GNUC_UNUSED gpointer data, GClosure *closure)
     GList *next;
     for (next = rclosure->objects; next; next = next->next) {
         GObject *object = G_OBJECT(next->data);
+        if (!NIL_P(rclosure->rb_holder)) {
+            g_rclosure_detach_raw_gobject(closure, object);
+        }
         g_object_weak_unref(object, rclosure_weak_notify, rclosure);
         g_closure_unref(closure);
-        VALUE obj = rbgobj_ruby_object_from_instance2(object, FALSE);
-        if (!NIL_P(rclosure->rb_holder) && !NIL_P(obj)) {
-            rbgobj_object_remove_relative(obj, rclosure->rb_holder);
-        }
     }
     g_list_free(rclosure->objects);
     rclosure->objects = NULL;
@@ -279,10 +279,7 @@ void
 g_rclosure_attach(GClosure *closure, VALUE object)
 {
     GRClosure *rclosure = (GRClosure *)closure;
-    rbgobj_add_relative_removable(object,
-                                  Qnil,
-                                  id_closures,
-                                  rclosure->rb_holder);
+    rbgobj_add_relative(object, rclosure->rb_holder);
 }
 
 void
@@ -297,11 +294,18 @@ g_rclosure_attach_gobject(GClosure *closure, VALUE object)
     rclosure->objects = g_list_prepend(rclosure->objects, gobject);
 }
 
+static void
+g_rclosure_detach_raw_gobject(GClosure *closure, GObject *gobject)
+{
+    GRClosure *rclosure = (GRClosure *)closure;
+    rbgobj_gobject_remove_relative(gobject, rclosure->rb_holder);
+}
+
 void
 g_rclosure_detach(GClosure *closure, VALUE object)
 {
     GRClosure *rclosure = (GRClosure *)closure;
-    rbgobj_remove_relative(object, id_closures, rclosure->rb_holder);
+    rbgobj_remove_relative(object, 0, rclosure->rb_holder);
 }
 
 void
@@ -338,7 +342,6 @@ static void
 init_rclosure(void)
 {
     id_call = rb_intern("call");
-    id_closures = rb_intern("closures");
     rclosure_initialized = TRUE;
     rb_set_end_proc(rclosure_end_proc, Qnil);
 }

data/ext/glib2/rbgobj_object.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2002-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2002-2023  Ruby-GNOME Project Team
  *  Copyright (C) 2002-2003  Masahiro Sakai
  *  Copyright (C) 1998-2000  Yukihiro Matsumoto,
  *                           Daisuke Kanda,
@@ -132,6 +132,15 @@ rbgobj_object_add_relative(VALUE rb_gobject, VALUE rb_relative)
     }
 }
 
+void
+rbgobj_gobject_remove_relative(GObject *gobject, VALUE rb_relative)
+{
+    gobj_holder *holder = g_object_get_qdata(gobject, RUBY_GOBJECT_OBJ_KEY);
+    if (holder && holder->rb_relatives) {
+        g_hash_table_remove(holder->rb_relatives, (gpointer)(rb_relative));
+    }
+}
+
 void
 rbgobj_object_remove_relative(VALUE rb_gobject, VALUE rb_relative)
 {
@@ -141,8 +150,7 @@ rbgobj_object_remove_relative(VALUE rb_gobject, VALUE rb_relative)
                          &rg_glib_object_type,
                          holder);
     if (holder->rb_relatives) {
-        g_hash_table_remove(holder->rb_relatives,
-                            (gpointer)(rb_relative));
+        g_hash_table_remove(holder->rb_relatives, (gpointer)(rb_relative));
     }
 }
 

data/ext/glib2/rbgobject.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2003-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2003-2023  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -146,6 +146,8 @@ extern void rbgobj_instance_unref(gpointer instance);
 
 extern void rbgobj_object_add_relative(VALUE rb_gobject,
                                        VALUE rb_relative);
+extern void rbgobj_gobject_remove_relative(GObject *gobject,
+                                           VALUE rb_relative);
 extern void rbgobj_object_remove_relative(VALUE rb_gobject,
                                           VALUE rb_relative);
 extern void rbgobj_object_remove_relatives(VALUE rb_gobject,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config