glib2 3.4.0 → 3.4.5

data/ext/glib2/rbglib_pollfd.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
@@ -21,30 +21,6 @@
 
 #include "rbgprivate.h"
 
-#if !GLIB_CHECK_VERSION(2, 36, 0)
-static GPollFD*
-pollfd_copy(const GPollFD* pollfd)
-{
-  GPollFD* new_pollfd;
-  g_return_val_if_fail (pollfd != NULL, NULL);
-
-  new_pollfd = g_new(GPollFD, 1);
-  *new_pollfd = *pollfd;
-  return new_pollfd;
-}
-
-GType
-g_pollfd_get_type(void)
-{
-  static GType our_type = 0;
-  if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GPollFD",
-                    (GBoxedCopyFunc)pollfd_copy,
-                    (GBoxedFreeFunc)g_free);
-  return our_type;
-}
-#endif
-
 #define RG_TARGET_NAMESPACE cPollFD
 #define _SELF(s) ((GPollFD*)RVAL2BOXED(s, G_TYPE_POLLFD))
 

data/ext/glib2/rbglib_regex.c

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015-2019  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
@@ -136,7 +136,6 @@ rg_split(gint argc, VALUE *argv, VALUE self)
     return STRV2RVAL_FREE(strings);
 }
 
-#if GLIB_CHECK_VERSION(2, 30, 0)
 static VALUE
 rg_match(gint argc, VALUE *argv, VALUE self)
 {
@@ -191,7 +190,6 @@ rg_match(gint argc, VALUE *argv, VALUE self)
     rb_iv_set(rb_match_info, "@string", rb_frozen_string);
     return rb_match_info;
 }
-#endif
 
 static VALUE
 rg_max_backref(VALUE self)
@@ -205,7 +203,6 @@ rg_capture_count(VALUE self)
     return INT2NUM(g_regex_get_capture_count(_SELF(self)));
 }
 
-#if GLIB_CHECK_VERSION(2, 34, 0)
 static VALUE
 rg_has_cr_or_lf_p(VALUE self)
 {
@@ -217,7 +214,6 @@ rg_max_lookbehind(VALUE self)
 {
     return INT2NUM(g_regex_get_max_lookbehind(_SELF(self)));
 }
-#endif
 
 static VALUE
 rg_string_number(VALUE self, VALUE string)
@@ -225,7 +221,6 @@ rg_string_number(VALUE self, VALUE string)
     return INT2NUM(g_regex_get_string_number(_SELF(self), RVAL2CSTR(string)));
 }
 
-#if GLIB_CHECK_VERSION(2, 30, 0)
 static VALUE
 rg_match_all(gint argc, VALUE *argv, VALUE self)
 {
@@ -423,7 +418,6 @@ rg_replace(gint argc, VALUE *argv, VALUE self)
 
     return CSTR2RVAL_FREE(modified_string);
 }
-#endif
 
 static VALUE
 rg_s_escape_string(G_GNUC_UNUSED VALUE self, VALUE string)
@@ -472,20 +466,14 @@ Init_glib_regex(void)
     RG_DEF_METHOD(compile_flags, 0);
     RG_DEF_METHOD(match_flags, 0);
     RG_DEF_METHOD(split, -1);
-#if GLIB_CHECK_VERSION(2, 30, 0)
     RG_DEF_METHOD(match, -1);
-#endif
     RG_DEF_METHOD(max_backref, 0);
     RG_DEF_METHOD(capture_count, 0);
-#if GLIB_CHECK_VERSION(2, 34, 0)
     RG_DEF_METHOD_P(has_cr_or_lf, 0);
     RG_DEF_METHOD(max_lookbehind, 0);
-#endif
     RG_DEF_METHOD(string_number, 1);
-#if GLIB_CHECK_VERSION(2, 30, 0)
     RG_DEF_METHOD(match_all, -1);
     RG_DEF_METHOD(replace, -1);
-#endif
 
     RG_DEF_SMETHOD(escape_string, 1);
     RG_DEF_SMETHOD(check_replacement, 1);

data/ext/glib2/rbglib_source.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2013  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
@@ -23,32 +23,6 @@
 
 static ID id_call;
 
-/*****************************************/
-#if !GLIB_CHECK_VERSION(2,30,0)
-static void
-source_free(GSource *source)
-{
-    if (g_source_is_destroyed(source)) {
-        return;
-    }
-
-    g_source_unref(source);
-    g_source_destroy(source);
-}
-
-GType
-g_source_get_type(void)
-{
-  static GType our_type = 0;
-  if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GSource",
-                    (GBoxedCopyFunc)g_source_ref,
-                    (GBoxedFreeFunc)source_free);
-  return our_type;
-}
-#endif
-/*****************************************/
-
 #define RG_TARGET_NAMESPACE cSource
 #define _SELF(s) ((GSource*)RVAL2BOXED(s, G_TYPE_SOURCE))
 
@@ -112,7 +86,6 @@ rg_id(VALUE self)
     return UINT2NUM(g_source_get_id(_SELF(self)));
 }
 
-#if GLIB_CHECK_VERSION(2, 26, 0)
 static VALUE
 rg_name(VALUE self)
 {
@@ -125,7 +98,6 @@ rg_set_name(VALUE self, VALUE name)
     g_source_set_name(_SELF(self), RVAL2CSTR(name));
     return self;
 }
-#endif
 
 static VALUE
 rg_context(VALUE self)
@@ -158,7 +130,6 @@ void        g_source_set_callback_indirect  (GSource *source,
                                              GSourceCallbackFuncs *callback_funcs);
 */
 
-#if GLIB_CHECK_VERSION(2, 36, 0)
 static VALUE
 rg_ready_time(VALUE self)
 {
@@ -173,7 +144,6 @@ rg_set_ready_time(VALUE self, VALUE ready_time)
     g_source_set_ready_time(_SELF(self), NUM2LL(ready_time));
     return self;
 }
-#endif
 
 static VALUE
 rg_add_poll(VALUE self, VALUE fd)
@@ -189,7 +159,6 @@ rg_remove_poll(VALUE self, VALUE fd)
     return self;
 }
 
-#if GLIB_CHECK_VERSION(2, 28, 0)
 static VALUE
 rg_time(VALUE self)
 {
@@ -197,7 +166,6 @@ rg_time(VALUE self)
     time = g_source_get_time(_SELF(self));
     return LL2NUM(time);
 }
-#endif
 
 /* How can I implement them ?
 gboolean    g_source_remove_by_funcs_user_data
@@ -226,21 +194,15 @@ Init_glib_source(void)
     RG_DEF_METHOD(set_can_recurse, 1);
     RG_DEF_METHOD_P(can_recurse, 0);
     RG_DEF_METHOD(id, 0);
-#if GLIB_CHECK_VERSION(2, 26, 0)
     RG_DEF_METHOD(name, 0);
     RG_REPLACE_SET_PROPERTY(name, 1);
-#endif
     RG_DEF_METHOD(context, 0);
     RG_DEF_METHOD(set_callback, 0);
-#if GLIB_CHECK_VERSION(2, 36, 0)
     RG_DEF_METHOD(ready_time, 0);
     RG_REPLACE_SET_PROPERTY(ready_time, 1);
-#endif
     RG_DEF_METHOD(add_poll, 1);
     RG_DEF_METHOD(remove_poll, 1);
-#if GLIB_CHECK_VERSION(2, 28, 0)
     RG_DEF_METHOD(time, 0);
-#endif
 
     /* GLib::Source.remove is moved to rbglib_maincontext.c */
 }

data/ext/glib2/rbglib_spawn.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
  *  Copyright (C) 2004  Kazuhiro NISHIYAMA
  *
@@ -29,10 +29,11 @@ static ID id_call;
 static ID id_new;
 
 static void
-child_setup(gpointer func)
+child_setup(gpointer data)
 {
-    if (! NIL_P(func)){
-        rb_funcall((VALUE)func, id_call, 0);
+    VALUE func = POINTER2RVAL(data);
+    if (!NIL_P(func)) {
+        rb_funcall(func, id_call, 0);
     }
 }
 
@@ -204,8 +205,6 @@ rg_s_command_line_async(G_GNUC_UNUSED VALUE self, VALUE str)
     return ret;
 }
 
-#ifdef HAVE_G_SPAWN_CLOSE_PID
-
 #define RVAL2GPID(value) ((GPid)NUM2INT(pid))
 
 static VALUE
@@ -215,8 +214,6 @@ rg_s_close_pid(G_GNUC_UNUSED VALUE self, VALUE pid)
     return Qnil;
 }
 
-#endif
-
 void
 Init_glib_spawn(void)
 {
@@ -231,9 +228,7 @@ Init_glib_spawn(void)
     RG_DEF_SMETHOD(sync, 4);
     RG_DEF_SMETHOD(command_line_sync, 1);
     RG_DEF_SMETHOD(command_line_async, 1);
-#ifdef HAVE_G_SPAWN_CLOSE_PID
     RG_DEF_SMETHOD(close_pid, 1);
-#endif
 
     rb_define_const(RG_TARGET_NAMESPACE, "LEAVE_DESCRIPTORS_OPEN", INT2NUM(G_SPAWN_LEAVE_DESCRIPTORS_OPEN));
     rb_define_const(RG_TARGET_NAMESPACE, "DO_NOT_REAP_CHILD", INT2NUM(G_SPAWN_DO_NOT_REAP_CHILD));

data/ext/glib2/rbglib_spawnerror.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
  *  Copyright (C) 2004  Kazuhiro NISHIYAMA
  *
@@ -35,7 +35,7 @@ Init_glib_spawnerror(void)
     rb_define_const(RG_TARGET_NAMESPACE, "CHDIR", INT2NUM(G_SPAWN_ERROR_CHDIR));
     rb_define_const(RG_TARGET_NAMESPACE, "EACCES", INT2NUM(G_SPAWN_ERROR_ACCES));
     rb_define_const(RG_TARGET_NAMESPACE, "EPERM", INT2NUM(G_SPAWN_ERROR_PERM));
-    rb_define_const(RG_TARGET_NAMESPACE, "E2BIG", INT2NUM(G_SPAWN_ERROR_2BIG));
+    rb_define_const(RG_TARGET_NAMESPACE, "TOO_BIG", INT2NUM(G_SPAWN_ERROR_TOO_BIG));
     rb_define_const(RG_TARGET_NAMESPACE, "ENOEXEC", INT2NUM(G_SPAWN_ERROR_NOEXEC));
     rb_define_const(RG_TARGET_NAMESPACE, "ENAMETOOLONG", INT2NUM(G_SPAWN_ERROR_NAMETOOLONG));
     rb_define_const(RG_TARGET_NAMESPACE, "ENOENT", INT2NUM(G_SPAWN_ERROR_NOENT));

data/ext/glib2/rbglib_threads.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) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -28,26 +28,13 @@ static VALUE RG_TARGET_NAMESPACE;
 static VALUE
 rg_s_init(VALUE self)
 {
-#ifdef HAVE_G_THREAD_INIT
-#if defined(G_THREADS_ENABLED) && !GLIB_CHECK_VERSION(2, 32, 0)
-    g_thread_init(NULL);
-#endif
-#endif
     return self;
 }
 
 static VALUE
 rg_s_supported_p(G_GNUC_UNUSED VALUE self)
 {
-#ifdef HAVE_G_THREAD_INIT
-#ifdef G_THREADS_ENABLED
-    return CBOOL2RVAL(g_thread_supported());
-#else
-    return Qfalse;
-#endif
-#else
-    return Qfalse;
-#endif
+    return Qtrue;
 
 }
 

data/ext/glib2/rbglib_timezone.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
@@ -22,7 +22,6 @@
 #define RG_TARGET_NAMESPACE cTimeZone
 #define _SELF(s) ((GTimeZone*)RVAL2BOXED(s, G_TYPE_TIME_ZONE))
 
-#if GLIB_CHECK_VERSION(2, 34, 0)
 static VALUE
 rg_initialize(gint argc, VALUE *argv, VALUE self)
 {
@@ -69,12 +68,10 @@ rg_offset(VALUE self, VALUE rb_interval)
     gint interval = NUM2INT(rb_interval);
     return INT2NUM(g_time_zone_get_offset(_SELF(self), interval));
 }
-#endif
 
 void
 Init_glib_time_zone(void)
 {
-#if GLIB_CHECK_VERSION(2, 34, 0)
     VALUE RG_TARGET_NAMESPACE;
     RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_TIME_ZONE, "TimeZone", mGLib);
     RG_DEF_METHOD(initialize, -1);
@@ -82,5 +79,4 @@ Init_glib_time_zone(void)
     RG_DEF_SMETHOD(utc, 0);
     RG_DEF_METHOD(abbreviation, 1);
     RG_DEF_METHOD(offset, 1);
-#endif
 }

data/ext/glib2/rbglib_unichar.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
@@ -105,7 +105,6 @@ rg_s_get_mirror_char(G_GNUC_UNUSED VALUE self, VALUE unichar)
     }
 }
 
-#if GLIB_CHECK_VERSION(2,14,0)
 static VALUE
 rg_s_combining_class(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
@@ -130,7 +129,6 @@ rg_s_zero_width_p(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return CBOOL2RVAL(g_unichar_iszerowidth(NUM2UINT(unichar)));
 }
-#endif
 
 static VALUE
 rg_s_to_utf8(G_GNUC_UNUSED VALUE self, VALUE unichar)
@@ -142,6 +140,48 @@ rg_s_to_utf8(G_GNUC_UNUSED VALUE self, VALUE unichar)
     return CSTR2RVAL_LEN(utf8, len);
 }
 
+static VALUE
+rg_s_compose(G_GNUC_UNUSED VALUE self, VALUE unichar1, VALUE unichar2)
+{
+    gunichar composed_char;
+    if (g_unichar_compose(NUM2UINT(unichar1),
+                          NUM2UINT(unichar2),
+                          &composed_char)) {
+        return UINT2NUM(composed_char);
+    } else {
+        return Qnil;
+    }
+}
+
+static VALUE
+rg_s_decompose(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+{
+    VALUE unichar;
+    VALUE options = Qnil;
+    gboolean compat = FALSE;
+
+    rb_scan_args(argc, argv, "1:", &unichar, &options);
+    if (!NIL_P(options)) {
+        ID keywords[1];
+        VALUE values[1];
+        keywords[0] = rb_intern("compat");
+        rb_get_kwargs(options, keywords, 0, 1, values);
+        if (values[0] != Qundef) {
+            compat = CBOOL2RVAL(values[0]);
+        }
+    }
+
+    /* 18 is enough. See g_unichar_fully_decompose() document. */
+    gunichar result[G_UNICHAR_MAX_DECOMPOSITION_LENGTH];
+    gsize result_len =
+        g_unichar_fully_decompose(NUM2UINT(unichar),
+                                  compat,
+                                  result,
+                                  G_UNICHAR_MAX_DECOMPOSITION_LENGTH);
+    return CSTR2RVAL_LEN_UCS4((const char *)result,
+                              result_len * sizeof(gunichar));
+}
+
 void
 Init_glib_unichar(void)
 {
@@ -190,12 +230,13 @@ Init_glib_unichar(void)
 
     RG_DEF_SMETHOD(get_mirror_char, 1);
 
-#if GLIB_CHECK_VERSION(2,14,0)
     RG_DEF_SMETHOD(combining_class, 1);
     RG_DEF_SMETHOD(get_script, 1);
     RG_DEF_SMETHOD_P(mark, 1);
     RG_DEF_SMETHOD_P(zero_width, 1);
-#endif
 
     RG_DEF_SMETHOD(to_utf8, 1);
+
+    RG_DEF_SMETHOD(compose, 2);
+    RG_DEF_SMETHOD(decompose, -1);
 }

data/ext/glib2/rbglib_unicode.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  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
@@ -49,20 +49,6 @@ rg_s_canonical_ordering(G_GNUC_UNUSED VALUE self, VALUE rb_ucs4)
     return normalized_ucs4;
 }
 
-static VALUE
-rg_s_canonical_decomposition(G_GNUC_UNUSED VALUE self, VALUE unichar)
-{
-    VALUE normalized_ucs4;
-    gunichar *ucs4;
-    gsize len;
-
-    ucs4 = g_unicode_canonical_decomposition(NUM2UINT(unichar), &len);
-    normalized_ucs4 = CSTR2RVAL_LEN_UCS4((const char *)ucs4,
-                                           len * sizeof(gunichar));
-    g_free(ucs4);
-    return normalized_ucs4;
-}
-
 void
 Init_glib_unicode(void)
 {
@@ -75,16 +61,13 @@ Init_glib_unicode(void)
     G_DEF_CLASS(G_TYPE_UNICODE_BREAK_TYPE, "BreakType", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, G_TYPE_UNICODE_BREAK_TYPE, "G_UNICODE_");
 
-#if GLIB_CHECK_VERSION(2,14,0)
     /* GUnicodeScript */
     G_DEF_CLASS(G_TYPE_UNICODE_SCRIPT, "Script", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, G_TYPE_UNICODE_SCRIPT, "G_UNICODE_");
-#endif
 
     G_DEF_CLASS(G_TYPE_NORMALIZE_MODE, "NormalizeMode", mGLib);
 
     rbg_define_singleton_method(mGLib, "charset", rbglib_m_charset, 0);
 
     RG_DEF_SMETHOD(canonical_ordering, 1);
-    RG_DEF_SMETHOD(canonical_decomposition, 1);
 }