glib2 3.4.3 → 3.4.4

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);
 

data/ext/glib2/rbglib_mainloop.c

@@ -1,7 +1,7 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
- *  Copyright (C) 2005,2006 Masao Mutoh
+ *  Copyright (C) 2011-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2005,2006  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -21,21 +21,6 @@
 
 #include "rbgprivate.h"
 
-/*****************************************/
-#if !GLIB_CHECK_VERSION(2,30,0)
-GType
-g_main_loop_get_type(void)
-{
-  static GType our_type = 0;
-  if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GMainLoop",
-                    (GBoxedCopyFunc)g_main_loop_ref,
-                    (GBoxedFreeFunc)g_main_loop_unref);
-  return our_type;
-}
-#endif
-/*****************************************/
-
 #define RG_TARGET_NAMESPACE cMainLoop
 #define _SELF(s) ((GMainLoop*)RVAL2BOXED(s, G_TYPE_MAIN_LOOP))
 

data/ext/glib2/rbglib_matchinfo.c

@@ -1,5 +1,5 @@
 /*
- *  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,6 @@
 #define RG_TARGET_NAMESPACE cMatchInfo
 #define _SELF(s) ((GMatchInfo*)RVAL2BOXED(s, G_TYPE_MATCH_INFO))
 
-#if GLIB_CHECK_VERSION(2, 30, 0)
 static VALUE
 rg_regex(VALUE self)
 {
@@ -158,12 +157,10 @@ rg_expand_references(VALUE self, VALUE rb_string)
 
     return CSTR2RVAL_FREE(expanded_string);
 }
-#endif
 
 void
 Init_glib_matchinfo(void)
 {
-#if GLIB_CHECK_VERSION(2, 30, 0)
     VALUE RG_TARGET_NAMESPACE;
 
     RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_MATCH_INFO, "MatchInfo", mGLib);
@@ -179,5 +176,4 @@ Init_glib_matchinfo(void)
     RG_DEF_METHOD(fetch_all, 0);
     RG_DEF_METHOD(next, 0);
     RG_DEF_METHOD(expand_references, 1);
-#endif
 }

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);