glib2 3.4.3 → 3.4.4

data/ext/glib2/rbglib_win32.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2006  Kouhei Sutou
  *
  *  This library is free software; you can redistribute it and/or
@@ -65,11 +65,10 @@ rbglib_m_win32_locale_filename_from_utf8_deprecated(VALUE self,
     return rg_s_locale_filename_from_utf8(self, utf8_filename);
 }
 
-#  if GLIB_CHECK_VERSION(2, 16, 0)
 static VALUE
 rg_s_get_package_installation_directory_of_module(int argc,
-                                VALUE *argv,
-                                VALUE self)
+                                                  VALUE *argv,
+                                                  VALUE self)
 {
     VALUE rb_module;
     gchar *directory;
@@ -84,7 +83,6 @@ rg_s_get_package_installation_directory_of_module(int argc,
     directory = g_win32_get_package_installation_directory_of_module(hmodule);
     return CSTR2RVAL_FREE(directory);
 }
-#  endif
 #endif
 
 void
@@ -105,8 +103,6 @@ Init_glib_win32(void)
     rbg_define_singleton_method(mGLib, "win32_locale_filename_from_utf8",
                               rbglib_m_win32_locale_filename_from_utf8_deprecated, 1);
 
-#  if GLIB_CHECK_VERSION(2, 16, 0)
     RG_DEF_SMETHOD(get_package_installation_directory_of_module, -1);
-#  endif
 #endif
 }

data/ext/glib2/rbgobj_binding.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-2021  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,6 @@
 
 #define _SELF(object) G_BINDING(RVAL2GOBJ(self))
 
-#if GLIB_CHECK_VERSION(2, 38, 0)
 static VALUE
 rg_unbind(VALUE self)
 {
@@ -39,18 +38,13 @@ rg_unbind(VALUE self)
 
     return self;
 }
-#endif
 
 void
 Init_gobject_gbinding(void)
 {
-#if GLIB_CHECK_VERSION(2, 26, 0)
     VALUE RG_TARGET_NAMESPACE;
 
     RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_BINDING, "Binding", mGLib);
-#endif
 
-#if GLIB_CHECK_VERSION(2, 38, 0)
     RG_DEF_METHOD(unbind, 0);
-#endif
 }

data/ext/glib2/rbgobj_closure.c

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
- *  Copyright (C) 2002-2006  Ruby-GNOME2 Project
+ *  Copyright (C) 2002-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -173,7 +172,7 @@ rclosure_unref(GRClosure *rclosure)
         g_list_free(rclosure->objects);
         rclosure->objects = NULL;
         if (!NIL_P(rclosure->rb_holder)) {
-            DATA_PTR(rclosure->rb_holder) = NULL;
+            RTYPEDDATA_DATA(rclosure->rb_holder) = NULL;
             rclosure->rb_holder = Qnil;
         }
     }
@@ -201,8 +200,10 @@ rclosure_invalidate(G_GNUC_UNUSED gpointer data, GClosure *closure)
 }
 
 static void
-gr_closure_holder_mark(GRClosure *rclosure)
+gr_closure_holder_mark(void *data)
 {
+    GRClosure *rclosure = data;
+
     if (!rclosure)
         return;
 
@@ -211,8 +212,10 @@ gr_closure_holder_mark(GRClosure *rclosure)
 }
 
 static void
-gr_closure_holder_free(GRClosure *rclosure)
+gr_closure_holder_free(void *data)
 {
+    GRClosure *rclosure = data;
+
     if (!rclosure)
         return;
 
@@ -225,6 +228,17 @@ gr_closure_holder_free(GRClosure *rclosure)
     }
 }
 
+static const rb_data_type_t rbg_closure_holder_type = {
+    "GLib::ClosureHolder",
+    {
+        gr_closure_holder_mark,
+        gr_closure_holder_free,
+    },
+    NULL,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static GClosure *
 g_rclosure_new_raw(VALUE callback_proc,
                    VALUE extra_args,
@@ -241,10 +255,9 @@ g_rclosure_new_raw(VALUE callback_proc,
     closure->objects    = NULL;
     closure->callback   = callback_proc;
     closure->extra_args = extra_args;
-    closure->rb_holder  = Data_Wrap_Struct(rb_cData,
-                                           gr_closure_holder_mark,
-                                           gr_closure_holder_free,
-                                           closure);
+    closure->rb_holder  = TypedData_Wrap_Struct(rb_cObject,
+                                                &rbg_closure_holder_type,
+                                                closure);
     closure->tag[0]     = '\0';
 
     g_closure_set_marshal((GClosure*)closure, &rclosure_marshal);

data/ext/glib2/rbgobj_object.c

@@ -1,11 +1,10 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
- *  Copyright (C) 2002-2004  Ruby-GNOME Project Team
+ *  Copyright (C) 2002-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2002-2003  Masahiro Sakai
- *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
- *                          Daisuke Kanda,
- *                          Hiroshi Igarashi
+ *  Copyright (C) 1998-2000  Yukihiro Matsumoto,
+ *                           Daisuke Kanda,
+ *                           Hiroshi Igarashi
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -496,140 +495,146 @@ gobj_s_properties(int argc, VALUE* argv, VALUE self)
     return ary;
 }
 
-static VALUE type_to_prop_setter_table;
-static VALUE type_to_prop_getter_table;
+static GHashTable *rbg_type_to_prop_setter_tables;
+static GMutex rbg_type_to_prop_setter_tables_mutex;
+static GHashTable *rbg_type_to_prop_getter_tables;
+static GMutex rbg_type_to_prop_getter_tables_mutex;
 
-void
-rbgobj_register_property_setter(GType gtype, const char *name, RValueToGValueFunc func)
+static void
+rbg_register_property_accessor(GHashTable *tables,
+                               GMutex *mutex,
+                               GType gtype,
+                               const char *name,
+                               gpointer accessor)
 {
-    GObjectClass* oclass;
-    GParamSpec* pspec;
+    g_mutex_lock(mutex);
 
-    VALUE table = rb_hash_aref(type_to_prop_setter_table, INT2FIX(gtype));
-    if (NIL_P(table)){
-        table = rb_hash_new();
-        rb_hash_aset(type_to_prop_setter_table, INT2FIX(gtype), table);
+    GHashTable *table = g_hash_table_lookup(tables, GUINT_TO_POINTER(gtype));
+    if (!table) {
+        table = g_hash_table_new(g_str_hash, g_str_equal);
+        g_hash_table_insert(tables, GUINT_TO_POINTER(gtype), table);
     }
 
-    oclass = g_type_class_ref(gtype);
-    pspec = g_object_class_find_property(oclass, name);
-
-    rb_hash_aset(table, CSTR2RVAL(g_param_spec_get_name(pspec)),
-                 Data_Wrap_Struct(rb_cData, NULL, NULL, func));
+    GObjectClass *gclass = g_type_class_ref(gtype);
+    GParamSpec *pspec = g_object_class_find_property(gclass, name);
+    g_hash_table_insert(table,
+                        (gchar *)g_param_spec_get_name(pspec),
+                        accessor);
+    g_type_class_unref(gclass);
 
-    g_type_class_unref(oclass);
+    g_mutex_unlock(mutex);
 }
 
-void
-rbgobj_register_property_getter(GType gtype, const char *name, GValueToRValueFunc func)
+static gpointer
+rbg_get_property_accessor(GHashTable *tables,
+                          GMutex *mutex,
+                          GType gtype,
+                          const char *name)
 {
-    GObjectClass* oclass;
-    GParamSpec* pspec;
-
-    VALUE table = rb_hash_aref(type_to_prop_getter_table, INT2FIX(gtype));
-    if (NIL_P(table)){
-        table = rb_hash_new();
-        rb_hash_aset(type_to_prop_getter_table, INT2FIX(gtype), table);
+    g_mutex_lock(mutex);
+
+    gpointer accessor = NULL;
+    GHashTable *table = g_hash_table_lookup(tables, GUINT_TO_POINTER(gtype));
+    if (table) {
+        GObjectClass *gclass = g_type_class_ref(gtype);
+        GParamSpec *pspec = g_object_class_find_property(gclass, name);
+        accessor = g_hash_table_lookup(table, g_param_spec_get_name(pspec));
+        g_type_class_unref(gclass);
     }
 
-    oclass = g_type_class_ref(gtype);
-    pspec = g_object_class_find_property(oclass, name);
+    g_mutex_unlock(mutex);
 
-    rb_hash_aset(table, CSTR2RVAL(g_param_spec_get_name(pspec)),
-                 Data_Wrap_Struct(rb_cData, NULL, NULL, func));
+    return accessor;
+}
 
-    g_type_class_unref(oclass);
+void
+rbgobj_register_property_setter(GType gtype,
+                                const char *name,
+                                RValueToGValueFunc func)
+{
+    rbg_register_property_accessor(rbg_type_to_prop_setter_tables,
+                                   &rbg_type_to_prop_setter_tables_mutex,
+                                   gtype,
+                                   name,
+                                   func);
+}
+
+void
+rbgobj_register_property_getter(GType gtype, const char *name, GValueToRValueFunc func)
+{
+    rbg_register_property_accessor(rbg_type_to_prop_getter_tables,
+                                   &rbg_type_to_prop_getter_tables_mutex,
+                                   gtype,
+                                   name,
+                                   func);
 }
 
 static VALUE
 rg_set_property(VALUE self, VALUE prop_name, VALUE val)
 {
-    GParamSpec* pspec;
     const char* name;
-
     if (SYMBOL_P(prop_name))
         name = rb_id2name(SYM2ID(prop_name));
     else
         name = StringValuePtr(prop_name);
 
-    pspec = g_object_class_find_property(G_OBJECT_GET_CLASS(RVAL2GOBJ(self)),
-                                         name);
-
+    GParamSpec* pspec =
+        g_object_class_find_property(G_OBJECT_GET_CLASS(RVAL2GOBJ(self)),
+                                     name);
     if (!pspec)
         rb_raise(eNoPropertyError, "No such property: %s", name);
-    else {
-        // FIXME: use rb_ensure to call g_value_unset()
-        RValueToGValueFunc setter = NULL;
-        GValue gval = G_VALUE_INIT;
 
-        g_value_init(&gval, G_PARAM_SPEC_VALUE_TYPE(pspec));
-
-        {
-            VALUE table = rb_hash_aref(type_to_prop_setter_table,
-                                       INT2FIX(pspec->owner_type));
-            if (!NIL_P(table)){
-                VALUE obj = rb_hash_aref(table, CSTR2RVAL(g_param_spec_get_name(pspec)));
-                if (!NIL_P(obj))
-                    Data_Get_Struct(obj, void, setter);
-            }
-        }
-        if (setter) {
-            setter(val, &gval);
-        } else {
-            rbgobj_rvalue_to_gvalue(val, &gval);
-        }
-
-        g_object_set_property(RVAL2GOBJ(self), name, &gval);
-        g_value_unset(&gval);
+    RValueToGValueFunc setter =
+        rbg_get_property_accessor(rbg_type_to_prop_setter_tables,
+                                  &rbg_type_to_prop_setter_tables_mutex,
+                                  pspec->owner_type,
+                                  name);
+    // FIXME: use rb_ensure to call g_value_unset()
+    GValue gval = G_VALUE_INIT;
+    g_value_init(&gval, G_PARAM_SPEC_VALUE_TYPE(pspec));
+    if (setter) {
+        setter(val, &gval);
+    } else {
+        rbgobj_rvalue_to_gvalue(val, &gval);
+    }
+    g_object_set_property(RVAL2GOBJ(self), name, &gval);
+    g_value_unset(&gval);
 
-        G_CHILD_SET(self, rb_intern(name), val);
+    G_CHILD_SET(self, rb_intern(name), val);
 
-        return self;
-    }
+    return self;
 }
 
 static VALUE
 rg_get_property(VALUE self, VALUE prop_name)
 {
-    GParamSpec* pspec;
     const char* name;
-
     if (SYMBOL_P(prop_name))
         name = rb_id2name(SYM2ID(prop_name));
     else
         name = StringValuePtr(prop_name);
 
-    pspec = g_object_class_find_property(G_OBJECT_GET_CLASS(RVAL2GOBJ(self)),
-                                         name);
-
+    GParamSpec *pspec =
+        g_object_class_find_property(G_OBJECT_GET_CLASS(RVAL2GOBJ(self)),
+                                     name);
     if (!pspec)
         rb_raise(eNoPropertyError, "No such property: %s", name);
-    else {
-        // FIXME: use rb_ensure to call g_value_unset()
-        GValueToRValueFunc getter = NULL;
-        GValue gval = G_VALUE_INIT;
-        VALUE ret;
-
-        {
-            VALUE table = rb_hash_aref(type_to_prop_getter_table,
-                                       INT2FIX(pspec->owner_type));
-            if (!NIL_P(table)){
-                VALUE obj = rb_hash_aref(table, CSTR2RVAL(g_param_spec_get_name(pspec)));
-                if (!NIL_P(obj))
-                    Data_Get_Struct(obj, void, getter);
-            }
-        }
-
-        g_value_init(&gval, G_PARAM_SPEC_VALUE_TYPE(pspec));
-        g_object_get_property(RVAL2GOBJ(self), name, &gval);
 
-        ret = getter ? getter(&gval) : GVAL2RVAL(&gval);
-        g_value_unset(&gval);
-
-        G_CHILD_SET(self, rb_intern(name), ret);
-
-        return ret;
-    }
+    GValueToRValueFunc getter =
+        rbg_get_property_accessor(rbg_type_to_prop_getter_tables,
+                                  &rbg_type_to_prop_getter_tables_mutex,
+                                  pspec->owner_type,
+                                  name);
+    // FIXME: use rb_ensure to call g_value_unset()
+    GValue gval = G_VALUE_INIT;
+    g_value_init(&gval, G_PARAM_SPEC_VALUE_TYPE(pspec));
+    g_object_get_property(RVAL2GOBJ(self), name, &gval);
+    VALUE ret = getter ? getter(&gval) : GVAL2RVAL(&gval);
+    g_value_unset(&gval);
+
+    G_CHILD_SET(self, rb_intern(name), ret);
+
+    return ret;
 }
 
 static VALUE rg_thaw_notify(VALUE self);
@@ -714,7 +719,6 @@ rg_type_name(VALUE self)
     return CSTR2RVAL(G_OBJECT_TYPE_NAME(RVAL2GOBJ(self)));
 }
 
-#if GLIB_CHECK_VERSION(2, 26, 0)
 typedef struct {
     VALUE transform_from_callback;
     VALUE transform_to_callback;
@@ -843,7 +847,6 @@ rg_bind_property(gint argc, VALUE *argv, VALUE self)
 
     return rb_binding;
 }
-#endif
 
 static VALUE
 rg_initialize(int argc, VALUE *argv, VALUE self)
@@ -1090,18 +1093,24 @@ Init_gobject_gobject(void)
     RG_DEF_METHOD(inspect, 0);
     RG_DEF_METHOD(type_name, 0);
 
-#if GLIB_CHECK_VERSION(2, 26, 0)
     RG_DEF_METHOD(bind_property, -1);
     G_DEF_CLASS(G_TYPE_BINDING_FLAGS, "BindingFlags", mGLib);
-#endif
 
     eNoPropertyError = rb_define_class_under(mGLib, "NoPropertyError",
                                              rb_eNameError);
 
-    rb_global_variable(&type_to_prop_setter_table);
-    rb_global_variable(&type_to_prop_getter_table);
-    type_to_prop_setter_table = rb_hash_new();
-    type_to_prop_getter_table = rb_hash_new();
+    rbg_type_to_prop_setter_tables =
+        g_hash_table_new_full(g_direct_hash,
+                              g_direct_equal,
+                              NULL,
+                              (GDestroyNotify)g_hash_table_unref);
+    g_mutex_init(&rbg_type_to_prop_setter_tables_mutex);
+    rbg_type_to_prop_getter_tables =
+        g_hash_table_new_full(g_direct_hash,
+                              g_direct_equal,
+                              NULL,
+                              (GDestroyNotify)g_hash_table_unref);
+    g_mutex_init(&rbg_type_to_prop_getter_tables_mutex);
 
     /* subclass */
     RG_DEF_SMETHOD(type_register, -1);

data/ext/glib2/rbgobj_param.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2011-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -276,7 +276,7 @@ rg_value_convert(int argc, VALUE* argv, VALUE self)
     rb_scan_args(argc, argv, "21", &src, &src_type, &strict_validation);
 
     /* FIXME: use rb_ensure to ensure following g_value_unset() call*/
-    g_value_init(&src_value, rbgobj_gtype_get(src_type));
+    g_value_init(&src_value, rbgobj_gtype_from_ruby(src_type));
     g_value_init(&dest_value, G_PARAM_SPEC_VALUE_TYPE(pspec));
 
     rbgobj_rvalue_to_gvalue(src, &src_value);
@@ -344,9 +344,7 @@ param_is_flag(G_PARAM_LAX_VALIDATION)
 param_is_flag(G_PARAM_STATIC_NAME)
 param_is_flag(G_PARAM_STATIC_NICK)
 param_is_flag(G_PARAM_STATIC_BLURB)
-#if GLIB_CHECK_VERSION(2, 42, 0)
 param_is_flag(G_PARAM_EXPLICIT_NOTIFY)
-#endif
 param_is_flag(G_PARAM_DEPRECATED)
 
 /**********************************************************************/
@@ -376,10 +374,8 @@ Init_gobject_gparam(void)
                     INT2FIX(G_PARAM_STATIC_NICK));
     rb_define_const(RG_TARGET_NAMESPACE, "STATIC_BLURB",
                     INT2FIX(G_PARAM_STATIC_BLURB));
-#if GLIB_CHECK_VERSION(2, 42, 0)
     rb_define_const(RG_TARGET_NAMESPACE, "EXPLICIT_NOTIFY",
                     INT2FIX(G_PARAM_EXPLICIT_NOTIFY));
-#endif
     rb_define_const(RG_TARGET_NAMESPACE, "DEPRECATED",
                     INT2FIX(G_PARAM_DEPRECATED));
     rb_define_const(RG_TARGET_NAMESPACE, "MASK",
@@ -432,10 +428,8 @@ Init_gobject_gparam(void)
                       param_is_G_PARAM_STATIC_NICK, 0);
     rbg_define_method(RG_TARGET_NAMESPACE, "static_blurb?",
                       param_is_G_PARAM_STATIC_BLURB, 0);
-#if GLIB_CHECK_VERSION(2, 42, 0)
     rbg_define_method(RG_TARGET_NAMESPACE, "explicit_notify?",
                       param_is_G_PARAM_EXPLICIT_NOTIFY, 0);
-#endif
     rbg_define_method(RG_TARGET_NAMESPACE, "deprecated?",
                       param_is_G_PARAM_DEPRECATED, 0);
 }