glib2 3.2.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e7c46f4eb5a10e1649d2b490cb2b833edae8e9ae5da9356b12e74989866f0a7
-  data.tar.gz: 14ed50ef75a95a8e7ecf5a68642ebfb42cb9a1d8099698c7e1c6f59652a5d9d3
+  metadata.gz: 77534c50691b8b994542848ef827853636695fbe6a2f28fc433566b41512bd5f
+  data.tar.gz: a08ac20b032e5a8e49fb508b260ca0c64a0e59a16eaa6af23d6eb0cc64bbfd23
 SHA512:
-  metadata.gz: 84c26c394a51846e36ecf67819123f025aff24f441e1866fb1468b33052b9971ff0fcdb1c318efca33d5fd4593eb1beb52d8c5ad8ad394b6ad30b3aa4c547ed6
-  data.tar.gz: 852ea6e2aeda7c5bb6ed596bf71bbb05de650e09391823f40451b6c8a66b64f1dd5edaebb681c151bdc3ec54d5c55cf63d1f18294446e4b44170f0e2911d74a7
+  metadata.gz: 82839b7d5c5178786b062a4e20acfaacc8099bd5f5bd12eb7bddb84f531064501117cc9400ab52c9aefd414afd094558152d11c55853424fc0ac618e3ba2145e
+  data.tar.gz: 54051be5590430b10aca4763ef9c0f663ca8abed7f006c68e48b8ff669187f00b527a2008fd794e7a387759c98859d300cd560b94d6e2caca61db3a1f508b85d

data/ext/glib2/glib2.def

@@ -61,6 +61,9 @@ EXPORTS
 	rbgobj_class_init_func
 	rbgobj_register_type
 	rbgobj_object_alloc_func
+	rbgobj_object_add_relative
+	rbgobj_object_remove_relative
+	rbgobj_object_remove_relatives
 	rbgobj_set_signal_func
 	rbgobj_get_signal_func
 	rbgobj_set_signal_call_func

data/ext/glib2/rbglib.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 2
-#define RBGLIB_MICRO_VERSION 4
+#define RBGLIB_MICRO_VERSION 5
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC
@@ -46,6 +46,10 @@ extern "C" {
 #  endif
 #endif
 
+#ifndef RB_ALLOC
+#  define RB_ALLOC(type) ALLOC(type)
+#endif
+
 #ifndef RB_ALLOC_N
 #  define RB_ALLOC_N(type, n) ALLOC_N(type, n)
 #endif

data/ext/glib2/rbgobj_binding.c

@@ -28,7 +28,15 @@
 static VALUE
 rg_unbind(VALUE self)
 {
-    g_binding_unbind(_SELF(self));
+    GBinding *binding = _SELF(self);
+    GObject *source;
+    VALUE rb_source;
+
+    source = g_binding_get_source(binding);
+    rb_source = GOBJ2RVAL(source);
+    rbgobj_object_remove_relative(rb_source, self);
+    g_binding_unbind(binding);
+
     return self;
 }
 #endif

data/ext/glib2/rbgobj_closure.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2016  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2006  Ruby-GNOME2 Project
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -191,8 +191,9 @@ rclosure_invalidate(G_GNUC_UNUSED gpointer data, GClosure *closure)
         for (next = rclosure->objects; next; next = next->next) {
             GObject *object = G_OBJECT(next->data);
             VALUE obj = rbgobj_ruby_object_from_instance2(object, FALSE);
-            if (!NIL_P(rclosure->rb_holder) && !NIL_P(obj))
-                G_REMOVE_RELATIVE(obj, id_closures, rclosure->rb_holder);
+            if (!NIL_P(rclosure->rb_holder) && !NIL_P(obj)) {
+                rbgobj_object_remove_relative(obj, rclosure->rb_holder);
+            }
         }
 
         rclosure_unref(rclosure);
@@ -286,16 +287,15 @@ rclosure_weak_notify(gpointer data, GObject* where_the_object_was)
 void
 g_rclosure_attach(GClosure *closure, VALUE object)
 {
-    static VALUE mGLibObject = (VALUE)NULL;
+    static VALUE cGLibObject = Qnil;
     GRClosure *rclosure = (GRClosure *)closure;
 
-    G_RELATIVE2(object, Qnil, id_closures, rclosure->rb_holder);
-
-    if (!mGLibObject) {
-        mGLibObject = rb_const_get(mGLib, rb_intern("Object"));
+    if (NIL_P(cGLibObject)) {
+        cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
     }
-    if (rb_obj_is_kind_of(object, mGLibObject)) {
+    if (rb_obj_is_kind_of(object, cGLibObject)) {
         GObject *gobject;
+        rbgobj_object_add_relative(object, rclosure->rb_holder);
         gobject = RVAL2GOBJ(object);
         rclosure->count++;
         g_object_weak_ref(gobject, rclosure_weak_notify, rclosure);

data/ext/glib2/rbgobj_object.c

@@ -43,19 +43,33 @@ weak_notify(gpointer data, G_GNUC_UNUSED GObject *where_the_object_was)
     gobj_holder *holder = data;
 
     rbgobj_instance_call_cinfo_free(holder->gobj);
-    rbgobj_invalidate_relatives(holder->self);
+    g_hash_table_unref(holder->rb_relatives);
+    holder->rb_relatives = NULL;
     holder->destroyed = TRUE;
 
     g_object_unref(holder->gobj);
     holder->gobj = NULL;
 }
 
+static void
+holder_relatives_mark(gpointer key, gpointer value, gpointer user_data)
+{
+    VALUE rb_relative = (VALUE)value;
+    rb_gc_mark(rb_relative);
+}
+
 static void
 holder_mark(void *data)
 {
     gobj_holder *holder = data;
-    if (holder->gobj && !holder->destroyed)
-        rbgobj_instance_call_cinfo_mark(holder->gobj);
+
+    if (!holder->gobj)
+        return;
+    if (holder->destroyed)
+        return;
+
+    rbgobj_instance_call_cinfo_mark(holder->gobj);
+    g_hash_table_foreach(holder->rb_relatives, holder_relatives_mark, NULL);
 }
 
 static void
@@ -91,6 +105,59 @@ static const rb_data_type_t rg_glib_object_type = {
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
+void
+rbgobj_object_add_relative(VALUE rb_gobject, VALUE rb_relative)
+{
+    gobj_holder *holder;
+    TypedData_Get_Struct(rb_gobject,
+                         gobj_holder,
+                         &rg_glib_object_type,
+                         holder);
+    if (holder->rb_relatives) {
+        g_hash_table_insert(holder->rb_relatives,
+                            (gpointer)(rb_relative),
+                            (gpointer)(rb_relative));
+    }
+}
+
+void
+rbgobj_object_remove_relative(VALUE rb_gobject, VALUE rb_relative)
+{
+    gobj_holder *holder;
+    TypedData_Get_Struct(rb_gobject,
+                         gobj_holder,
+                         &rg_glib_object_type,
+                         holder);
+    if (holder->rb_relatives) {
+        g_hash_table_remove(holder->rb_relatives,
+                            (gpointer)(rb_relative));
+    }
+}
+
+static gboolean
+rbgobj_object_remove_relatives_body(gpointer key,
+                                    gpointer value,
+                                    gpointer user_data)
+{
+    VALUE rb_relative = (VALUE)value;
+    VALUE rb_relative_class = (VALUE)user_data;
+
+    return RVAL2CBOOL(rb_obj_is_kind_of(rb_relative, rb_relative_class));
+}
+
+void
+rbgobj_object_remove_relatives(VALUE rb_gobject, VALUE rb_relative_class)
+{
+    gobj_holder *holder;
+    TypedData_Get_Struct(rb_gobject,
+                         gobj_holder,
+                         &rg_glib_object_type,
+                         holder);
+    g_hash_table_foreach_remove(holder->rb_relatives,
+                                rbgobj_object_remove_relatives_body,
+                                (gpointer)(rb_relative_class));
+}
+
 VALUE
 rbgobj_object_alloc_func(VALUE klass)
 {
@@ -105,6 +172,7 @@ rbgobj_object_alloc_func(VALUE klass)
     holder->gobj  = NULL;
     holder->cinfo = NULL;
     holder->destroyed = FALSE;
+    holder->rb_relatives = g_hash_table_new(g_direct_hash, g_direct_equal);
 
     return result;
 }
@@ -686,13 +754,6 @@ static void
 rg_destroy_bind_property_full_data(gpointer user_data)
 {
     RGBindPropertyCallbackData *data = (RGBindPropertyCallbackData *)user_data;
-
-    if (!NIL_P(data->transform_to_callback))
-        G_CHILD_REMOVE(data->self, data->transform_to_callback);
-
-    if (!NIL_P(data->transform_from_callback))
-        G_CHILD_REMOVE(data->self, data->transform_from_callback);
-
     xfree(data);
 }
 
@@ -715,6 +776,7 @@ rg_bind_property(gint argc, VALUE *argv, VALUE self)
     GBinding *binding;
     GBindingTransformFunc transform_to = NULL;
     GBindingTransformFunc transform_from = NULL;
+    VALUE rb_binding;
 
     rb_scan_args(argc, argv, "41", &rb_source_property, &rb_target,
                  &rb_target_property, &rb_flags, &rb_options);
@@ -731,18 +793,16 @@ rg_bind_property(gint argc, VALUE *argv, VALUE self)
     flags = RVAL2GBINDINGFLAGS(rb_flags);
 
     if (!NIL_P(rb_transform_to)) {
-        G_CHILD_ADD(self, rb_transform_to);
         transform_to = rg_bind_property_transform_to_callback;
     }
 
     if (!NIL_P(rb_transform_from)) {
-        G_CHILD_ADD(self, rb_transform_from);
         transform_from = rg_bind_property_transform_from_callback;
     }
 
     if (transform_to || transform_from) {
         RGBindPropertyCallbackData *data;
-        data = (RGBindPropertyCallbackData *)xmalloc(sizeof(RGBindPropertyCallbackData));
+        data = RB_ALLOC(RGBindPropertyCallbackData);
         data->self = self;
         data->transform_to_callback = rb_transform_to;
         data->transform_from_callback = rb_transform_from;
@@ -752,13 +812,21 @@ rg_bind_property(gint argc, VALUE *argv, VALUE self)
                                               transform_from,
                                               (gpointer)data,
                                               rg_destroy_bind_property_full_data);
+        rb_binding = GOBJ2RVAL(binding);
+        if (!NIL_P(rb_transform_to)) {
+            rbgobj_object_add_relative(rb_binding, rb_transform_to);
+        }
+        if (!NIL_P(rb_transform_from)) {
+            rbgobj_object_add_relative(rb_binding, rb_transform_from);
+        }
     } else {
         binding = g_object_bind_property(source, source_property,
                                          target, target_property,
                                          flags);
+        rb_binding = GOBJ2RVAL(binding);
     }
 
-    return GOBJ2RVAL(binding);
+    return rb_binding;
 }
 #endif
 

data/ext/glib2/rbgobject.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
  *  Copyright (C) 2003-2006  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
@@ -183,16 +183,25 @@ rbgobj_ruby_object_from_instance_with_unref(gpointer instance)
 void
 rbgobj_add_relative(VALUE obj, VALUE relative)
 {
-    VALUE hash = Qnil;
+    static VALUE mGLibObject = Qnil;
+    if (NIL_P(mGLibObject)) {
+        mGLibObject = rb_const_get(mGLib, rb_intern("Object"));
+    }
 
-    if (RVAL2CBOOL(rb_ivar_defined(obj, id_relatives)))
-        hash = rb_ivar_get(obj, id_relatives);
+    if (rb_obj_is_kind_of(obj, mGLibObject)) {
+        rbgobj_object_add_relative(obj, relative);
+    } else {
+        VALUE hash = Qnil;
 
-    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
-        hash = rb_hash_new();
-        rb_ivar_set(obj, id_relatives, hash);
+        if (RVAL2CBOOL(rb_ivar_defined(obj, id_relatives)))
+            hash = rb_ivar_get(obj, id_relatives);
+
+        if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
+            hash = rb_hash_new();
+            rb_ivar_set(obj, id_relatives, hash);
+        }
+        rb_hash_aset(hash, relative, Qnil);
     }
-    rb_hash_aset(hash, relative, Qnil);
 }
 
 void
@@ -207,16 +216,26 @@ rbgobj_invalidate_relatives(VALUE obj)
 void
 rbgobj_add_relative_removable(VALUE obj, VALUE relative, ID obj_ivar_id, VALUE hash_key)
 {
-    VALUE hash = Qnil;
+    static VALUE cGLibObject = Qnil;
+    if (NIL_P(cGLibObject)) {
+        cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
+    }
 
-    if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
-        hash = rb_ivar_get(obj, obj_ivar_id);
+    if (obj_ivar_id == rbgobj_id_children &&
+        rb_obj_is_kind_of(obj, cGLibObject)) {
+        rbgobj_object_add_relative(obj, hash_key);
+    } else {
+        VALUE hash = Qnil;
 
-    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
-        hash = rb_hash_new();
-        rb_ivar_set(obj, obj_ivar_id, hash);
+        if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
+            hash = rb_ivar_get(obj, obj_ivar_id);
+
+        if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
+            hash = rb_hash_new();
+            rb_ivar_set(obj, obj_ivar_id, hash);
+        }
+        rb_hash_aset(hash, hash_key, relative);
     }
-    rb_hash_aset(hash, hash_key, relative);
 }
 
 VALUE
@@ -236,15 +255,25 @@ rbgobj_get_relative_removable(VALUE obj, ID obj_ivar_id, VALUE hash_key)
 void
 rbgobj_remove_relative(VALUE obj, ID obj_ivar_id, VALUE hash_key)
 {
-    VALUE hash = Qnil;
-
-    if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
-        hash = rb_ivar_get(obj, obj_ivar_id);
+    static VALUE cGLibObject = Qnil;
+    if (NIL_P(cGLibObject)) {
+        cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
+    }
 
-    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
-        /* should not happen. */
+    if ((obj_ivar_id == id_relatives || obj_ivar_id == rbgobj_id_children) &&
+        rb_obj_is_kind_of(obj, cGLibObject)) {
+        rbgobj_object_remove_relative(obj, hash_key);
     } else {
-        rb_funcall(hash, id_delete, 1, hash_key);
+        VALUE hash = Qnil;
+
+        if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
+            hash = rb_ivar_get(obj, obj_ivar_id);
+
+        if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
+            /* should not happen. */
+        } else {
+            rb_funcall(hash, id_delete, 1, hash_key);
+        }
     }
 }
 

data/ext/glib2/rbgobject.h

@@ -79,6 +79,7 @@ RUBY_GLIB2_VAR  ID rbgobj_id_children;
     (rbgobj_add_relative_removable(self, Qnil, rbgobj_id_children, child))
 #define G_CHILD_REMOVE(self, child) \
     (rbgobj_remove_relative(self, rbgobj_id_children, child))
+/* Deprecated since 3.2.5. Use rbobj_object_remove_relatives() instead. */
 #define G_CHILD_REMOVE_ALL(self) \
     (rbgobj_remove_relative_all(self, rbgobj_id_children))
 
@@ -147,6 +148,13 @@ extern VALUE rbgobj_ruby_object_from_instance2(gpointer instance, gboolean alloc
 extern VALUE rbgobj_ruby_object_from_instance_with_unref(gpointer instance);
 extern void rbgobj_instance_unref(gpointer instance);
 
+extern void rbgobj_object_add_relative(VALUE rb_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,
+                                           VALUE rb_relative_class);
+
 extern void rbgobj_add_relative(VALUE obj, VALUE relative);
 extern void rbgobj_invalidate_relatives(VALUE obj);
 extern void rbgobj_add_relative_removable(VALUE obj, VALUE relative,

data/ext/glib2/rbgprivate.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2007-2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007-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
@@ -42,6 +42,7 @@ typedef struct {
     GObject* gobj;
     const RGObjClassInfo* cinfo;
     gboolean destroyed;
+    GHashTable *rb_relatives;
 } gobj_holder;
 
 typedef struct {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config