glib2 3.4.3 → 3.4.7

data/ext/glib2/rbglib-variant.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015-2016  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
@@ -22,7 +22,7 @@
 
 #define RG_TARGET_NAMESPACE cVariant
 
-#define _SELF(s) (DATA_PTR(s))
+#define _SELF(s) (RTYPEDDATA_DATA(s))
 
 static VALUE RG_TARGET_NAMESPACE;
 
@@ -191,7 +191,6 @@ rg_ruby_to_variant(VALUE rb_value, VALUE rb_variant_type)
             }
         }
         return g_variant_new_strv(strings, length);
-#if GLIB_CHECK_VERSION(2, 30, 0)
     } else if (g_variant_type_equal(variant_type,
                                     G_VARIANT_TYPE_OBJECT_PATH_ARRAY)) {
         const gchar **paths;
@@ -210,7 +209,6 @@ rg_ruby_to_variant(VALUE rb_value, VALUE rb_variant_type)
             }
         }
         return g_variant_new_objv(paths, length);
-#endif
     } else if (g_variant_type_equal(variant_type, G_VARIANT_TYPE_ARRAY)) {
         int i;
         GVariantBuilder builder;
@@ -259,7 +257,7 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &rb_value, &rb_variant_type);
     variant = rg_ruby_to_variant(rb_value, rb_variant_type);
     g_variant_ref_sink(variant);
-    DATA_PTR(self) = variant;
+    RTYPEDDATA_DATA(self) = variant;
 
     return Qnil;
 }

data/ext/glib2/rbglib.c

@@ -1072,6 +1072,10 @@ extern void Init_glib2(void);
 void
 Init_glib2(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
     const gchar **filename_charsets;
 
     id_inspect = rb_intern("inspect");

data/ext/glib2/rbglib.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2002-2020  Ruby-GNOME Project Team
+ *  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
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 4
-#define RBGLIB_MICRO_VERSION 3
+#define RBGLIB_MICRO_VERSION 7
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC
@@ -139,6 +139,9 @@ G_BEGIN_DECLS
 #define RVAL2GUINT32S(ary, n) rbg_rval2guint32s(&(ary), &(n))
 #define RVAL2GDOUBLES(ary, n) rbg_rval2gdoubles(&(ary), &(n))
 
+#define RVAL2POINTER(value) ((gpointer)(value))
+#define POINTER2RVAL(pointer) ((VALUE)(pointer))
+
 #define GINTS2RVAL(ary, n) rbg_gints2rval(ary, n)
 #define GINTS2RVAL_FREE(ary, n) rbg_gints2rval(ary, n)
 
@@ -219,6 +222,13 @@ extern VALUE rbg_check_hash_type(VALUE object);
 extern void rbg_scan_options(VALUE options, ...);
 
 /* rbgerror.h */
+typedef enum {
+  RBG_RUBY_ERROR_UNKNOWN,
+} RBGRubyError;
+
+#define RBG_RUBY_ERROR rbgerr_ruby_error_quark()
+extern GQuark rbgerr_ruby_error_quark(void);
+
 extern VALUE rbgerr_gerror2exception(GError *error);
 extern VALUE rbgerr_define_gerror(GQuark domain, const gchar* name, VALUE module, VALUE parent, GType gtype);
 

data/ext/glib2/rbglib_bookmarkfile.c

@@ -385,7 +385,7 @@ rg_set_groups(VALUE self, VALUE rburi, VALUE rbgroups)
     long n;
     gchar **groups = RVAL2STRS(rbgroups, n);
 
-    g_bookmark_file_set_groups(bookmark, uri, groups, n);
+    g_bookmark_file_set_groups(bookmark, uri, (const gchar **)groups, n);
 
     g_free(groups);
 

data/ext/glib2/rbglib_datetime.c

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2016-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
@@ -69,10 +69,8 @@ rg_s_now(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
         date = g_date_time_new_now_local();
     } else if (is_utc_timezone(rb_timezone)) {
         date = g_date_time_new_now_utc();
-#if GLIB_CHECK_VERSION(2, 34, 0)
     } else if (is_timezone(rb_timezone)) {
         date = g_date_time_new_now(RVAL2GTIMEZONE(rb_timezone));
-#endif
     } else {
         rb_raise(rb_eArgError,
                  "timezone must be nil, :local, :utc or GLib::TimeZone: "
@@ -160,7 +158,6 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
                                            hour,
                                            minute,
                                            second);
-#if GLIB_CHECK_VERSION(2, 34, 0)
         } else if (is_timezone(rb_timezone)) {
             GTimeZone *timezone = NULL;
 
@@ -172,7 +169,6 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
                                        hour,
                                        minute,
                                        second);
-#endif
         } else {
             rb_raise(rb_eArgError,
                      ":timezone must be nil, :local, :utc or GLib::TimeZone: "

data/ext/glib2/rbglib_error.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2004  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -29,6 +29,8 @@ static VALUE gerror_table;
 static VALUE generic_error;
 static VALUE error_info;
 
+G_DEFINE_QUARK(ruby-error-quark, rbgerr_ruby_error)
+
 VALUE
 rbgerr_gerror2exception(GError *error)
 {
@@ -107,9 +109,13 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
 {
     VALUE error_class;
     VALUE code_classes;
+    VALUE rb_domain = rb_str_new_cstr(g_quark_to_string(domain));
+    rbgutil_string_set_utf8_encoding(rb_domain);
 
     error_class = rb_define_class_under(module, name, parent);
-    rb_include_module(error_class, error_info);
+    rb_ivar_set(error_class, id_code, Qnil);
+    rb_ivar_set(error_class, id_domain, rb_domain);
+    rb_prepend_module(error_class, error_info);
 
     rb_hash_aset(gerror_table, UINT2NUM(domain), error_class);
 
@@ -140,6 +146,8 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
                                                code_class_name,
                                                error_class);
             g_free(code_class_name);
+            rb_ivar_set(code_class, id_code, INT2NUM(entry->value));
+            rb_ivar_set(code_class, id_domain, rb_domain);
             rb_hash_aset(code_classes, INT2NUM(entry->value), code_class);
         }
 
@@ -149,6 +157,15 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
     return error_class;
 }
 
+static VALUE
+rg_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE klass = rb_obj_class(self);
+    rb_ivar_set(self, id_code, rb_ivar_get(klass, id_code));
+    rb_ivar_set(self, id_domain, rb_ivar_get(klass, id_domain));
+    return rb_call_super(argc, argv);
+}
+
 static VALUE
 rbg_error_to_ruby(const GValue *from)
 {
@@ -166,9 +183,11 @@ Init_glib_error(void)
     gerror_table = rb_hash_new();
     rb_global_variable(&gerror_table);
 
+#define RG_TARGET_NAMESPACE error_info
     error_info = rb_define_module_under(mGLib, "ErrorInfo");
     rb_define_attr(error_info, "code", TRUE, FALSE);
     rb_define_attr(error_info, "domain", TRUE, FALSE);
+    RG_DEF_METHOD(initialize, -1);
 
     generic_error = rb_define_class_under(mGLib, "Error", rb_eRuntimeError);
     rb_include_module(generic_error, error_info);

data/ext/glib2/rbglib_fileutils.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) 2004  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -49,15 +49,6 @@ void        g_dir_rewind                    (GDir *dir);
 void        g_dir_close                     (GDir *dir);
 */
 
-#if GLIB_CHECK_VERSION(2, 16, 0)
-static VALUE
-rbglib_m_format_size_for_display(G_GNUC_UNUSED VALUE self, VALUE size)
-{
-    return CSTR2RVAL_FREE(g_format_size_for_display(NUM2OFFT(size)));
-}
-#endif
-
-#if GLIB_CHECK_VERSION(2, 30, 0)
 static VALUE
 rbglib_m_format_size(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
@@ -76,7 +67,6 @@ rbglib_m_format_size(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                                RVAL2GFORMATSIZEFLAGS(rb_flags)));
     }
 }
-#endif
 
 void
 Init_glib_fileutils(void)
@@ -108,12 +98,6 @@ Init_glib_fileutils(void)
     rb_define_const(RG_TARGET_NAMESPACE, "PERM", INT2NUM(G_FILE_ERROR_PERM));
     rb_define_const(RG_TARGET_NAMESPACE, "FAILED", INT2NUM(G_FILE_ERROR_FAILED));
 
-#if GLIB_CHECK_VERSION(2, 16, 0)
-    rbg_define_singleton_method(mGLib, "format_size_for_display",
-			      rbglib_m_format_size_for_display, 1);
-#endif
-#if GLIB_CHECK_VERSION(2, 30, 0)
     rbg_define_singleton_method(mGLib, "format_size",
                                 rbglib_m_format_size, -1);
-#endif
 }

data/ext/glib2/rbglib_iochannel.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) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -84,7 +84,7 @@ rg_initialize(gint argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ioc_close(VALUE self)
+ioc_shutdown(VALUE self)
 {
     GError* err = NULL;
     GIOStatus status = g_io_channel_shutdown(_SELF(self), TRUE, &err);
@@ -114,7 +114,7 @@ rg_s_open(gint argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 #endif
     } else {
         GError* err = NULL;
-        io = g_io_channel_new_file(RVAL2CSTR(arg1), 
+        io = g_io_channel_new_file(RVAL2CSTR(arg1),
                                    NIL_P(arg2) ? "r" : RVAL2CSTR(arg2), &err);
 
         if (err != NULL) RAISE_GERROR(err);
@@ -123,7 +123,7 @@ rg_s_open(gint argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
     rio = BOXED2RVAL(io, G_TYPE_IO_CHANNEL);
 
     if (rb_block_given_p()) {
-        return rb_ensure(rb_yield, rio, ioc_close, rio);
+        return rb_ensure(rb_yield, rio, ioc_shutdown, rio);
     }
     return rio;
 }

data/ext/glib2/rbglib_keyfile.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) 2006  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -21,34 +21,6 @@
 
 #include "rbgprivate.h"
 
-#if !GLIB_CHECK_VERSION(2,31,2)
-/************************************************/
-static GKeyFile*
-keyfile_copy(const GKeyFile* keyfile)
-{
-//  GKeyFile* new_keyfile;
-  g_return_val_if_fail (keyfile != NULL, NULL);
-/*
-  new_keyfile = g_key_file_new();
-  *new_keyfile = (GKeyFile*)*keyfile;
-  return new_keyfile;
-*/
-  return (GKeyFile*)keyfile;
-}
-
-GType
-g_key_file_get_type(void)
-{
-  static GType our_type = 0;
-  if (our_type == 0)
-    our_type = g_boxed_type_register_static("GKeyFile",
-                                            (GBoxedCopyFunc)keyfile_copy,
-                                            (GBoxedFreeFunc)g_key_file_free);
-  return our_type;
-}
-/************************************************/
-#endif
-
 #define RG_TARGET_NAMESPACE cKeyFile
 #define _SELF(self) ((GKeyFile*)(RVAL2BOXED(self, G_TYPE_KEY_FILE)))
 
@@ -140,7 +112,6 @@ rg_load_from_data_dirs(int argc, VALUE *argv, VALUE self)
     return full_path ? CSTR2RVAL(full_path) : Qnil;
 }
 
-#if GLIB_CHECK_VERSION(2, 14, 0)
 static VALUE
 rg_load_from_dirs(int argc, VALUE *argv, VALUE self)
 {
@@ -175,7 +146,6 @@ rg_load_from_dirs(int argc, VALUE *argv, VALUE self)
 
     return CSTR2RVAL(full_path);
 }
-#endif
 
 static VALUE
 rg_to_data(VALUE self)
@@ -670,9 +640,7 @@ Init_glib_keyfile(void)
     RG_DEF_METHOD(load_from_file, -1);
     RG_DEF_METHOD(load_from_data, -1);
     RG_DEF_METHOD(load_from_data_dirs, -1);
-#if GLIB_CHECK_VERSION(2, 14, 0)
     RG_DEF_METHOD(load_from_dirs, -1);
-#endif
     RG_DEF_METHOD(to_data, 0);
     RG_DEF_METHOD(start_group, 0);
     RG_DEF_METHOD(groups, 0);
@@ -711,7 +679,6 @@ Init_glib_keyfile(void)
     G_DEF_CLASS(G_TYPE_KEY_FILE_FLAGS, "Flags", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, G_TYPE_KEY_FILE_FLAGS, "G_KEY_FILE_");
 
-#if GLIB_CHECK_VERSION(2, 14, 0)
     /* Defines for handling freedesktop.org Desktop files */
     rb_define_const(RG_TARGET_NAMESPACE, "DESKTOP_GROUP", CSTR2RVAL(G_KEY_FILE_DESKTOP_GROUP));
 
@@ -760,5 +727,4 @@ Init_glib_keyfile(void)
                     CSTR2RVAL(G_KEY_FILE_DESKTOP_TYPE_LINK));
     rb_define_const(RG_TARGET_NAMESPACE, "DESKTOP_TYPE_DIRECTORY",
                     CSTR2RVAL(G_KEY_FILE_DESKTOP_TYPE_DIRECTORY));
-#endif
 }

data/ext/glib2/rbglib_maincontext.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
 #  include <ruby/thread.h>
 #endif
 
-GStaticPrivate rg_polling_key = G_STATIC_PRIVATE_INIT;
+GPrivate rg_polling_key = G_PRIVATE_INIT(NULL);
 
 /*
 static ID id_poll_func;
@@ -87,7 +87,7 @@ rg_poll(GPollFD *ufds, guint nfsd, gint timeout)
     info.timeout = timeout;
     info.result = 0;
 
-    g_static_private_set(&rg_polling_key, GINT_TO_POINTER(TRUE), NULL);
+    g_private_set(&rg_polling_key, GINT_TO_POINTER(TRUE));
     if (g_thread_self() == main_thread) {
 #ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
         rb_thread_call_without_gvl(rg_poll_in_blocking, &info,
@@ -99,7 +99,7 @@ rg_poll(GPollFD *ufds, guint nfsd, gint timeout)
     } else {
         rg_poll_in_blocking_raw(&info);
     }
-    g_static_private_set(&rg_polling_key, GINT_TO_POINTER(FALSE), NULL);
+    g_private_set(&rg_polling_key, GINT_TO_POINTER(FALSE));
 
     return info.result;
 }
@@ -148,21 +148,6 @@ source_destroy_notify(gpointer data)
     xfree(info);
 }
 
-/*****************************************/
-#if !GLIB_CHECK_VERSION(2,30,0)
-GType
-g_main_context_get_type(void)
-{
-  static GType our_type = 0;
-  if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GMainContext",
-                    (GBoxedCopyFunc)g_main_context_ref,
-                    (GBoxedFreeFunc)g_main_context_unref);
-  return our_type;
-}
-#endif
-/*****************************************/
-
 #define RG_TARGET_NAMESPACE cMainContext
 #define _SELF(s) ((GMainContext*)RVAL2BOXED(s, G_TYPE_MAIN_CONTEXT))
 
@@ -386,26 +371,23 @@ rg_remove_poll(VALUE self, VALUE fd)
     return self;
 }
 
-#ifdef HAVE_G_MAIN_DEPTH
 static VALUE
 rg_s_depth(G_GNUC_UNUSED VALUE self)
 {
     return INT2NUM(g_main_depth());
 }
-#endif
 
 static VALUE
 timeout_source_new(G_GNUC_UNUSED VALUE self, VALUE interval)
 {
     return BOXED2RVAL(g_timeout_source_new(NUM2UINT(interval)), G_TYPE_SOURCE);
 }
-#if GLIB_CHECK_VERSION(2,14,0)
+
 static VALUE
 timeout_source_new_seconds(G_GNUC_UNUSED VALUE self, VALUE interval)
 {
     return BOXED2RVAL(g_timeout_source_new_seconds(NUM2UINT(interval)), G_TYPE_SOURCE);
 }
-#endif
 
 static VALUE
 timeout_add(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
@@ -431,7 +413,6 @@ timeout_add(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
     return rb_id;
 }
 
-#if GLIB_CHECK_VERSION(2,14,0)
 static VALUE
 timeout_add_seconds(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
@@ -455,7 +436,6 @@ timeout_add_seconds(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
     rbgobj_add_relative(mGLibSource, func);
     return rb_id;
 }
-#endif
 
 static VALUE
 idle_source_new(G_GNUC_UNUSED VALUE self)
@@ -526,7 +506,7 @@ Init_glib_main_context(void)
 
     id_call = rb_intern("call");
 
-    g_static_private_set(&rg_polling_key, GINT_TO_POINTER(FALSE), NULL);
+    g_private_set(&rg_polling_key, GINT_TO_POINTER(FALSE));
 
     main_thread = g_thread_self();
 
@@ -559,17 +539,11 @@ Init_glib_main_context(void)
 */
     RG_DEF_METHOD(add_poll, 2);
     RG_DEF_METHOD(remove_poll, 1);
-#ifdef HAVE_G_MAIN_DEPTH
     RG_DEF_SMETHOD(depth, 0);
-#endif
     rbg_define_singleton_method(timeout, "source_new", timeout_source_new, 1);
-#if GLIB_CHECK_VERSION(2,14,0)
     rbg_define_singleton_method(timeout, "source_new_seconds", timeout_source_new_seconds, 1);
-#endif
     rbg_define_singleton_method(timeout, "add", timeout_add, -1);
-#if GLIB_CHECK_VERSION(2,14,0)
     rbg_define_singleton_method(timeout, "add_seconds", timeout_add_seconds, -1);
-#endif
     rbg_define_singleton_method(idle, "source_new", idle_source_new, 0);
     rbg_define_singleton_method(idle, "add", idle_add, -1);