glib2 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b227a9758d39dfe359af6c1c62fd1e80d6ea21e3
-  data.tar.gz: 05b7473ed8ec17f8e0b858fff2cadff344b0ca27
+  metadata.gz: b94f7308e7d76205d90b18b897c9d69accc2a888
+  data.tar.gz: 9aeb896467dcdd6ddd7656ff0dc7f82efe8feacd
 SHA512:
-  metadata.gz: 499ab40a274a334fb3121c98c07919dbd75bd6b0468cb777d7966c25ac156fee234d3befdddc8d4c58796661eedb0d903233978e59fe466cf96abc43e37c7ab7
-  data.tar.gz: 9ab7657fe78e454cb20305cffaf57e00d6643e2626566c6ed989e0a04c19f5f6282e453e9622569b79023c60803a54ab11cd2f9d9344df30c56946aa23d02117
+  metadata.gz: 2436a45d9721ab2bd307a33bb541980ab2e178f26fe686e9ef97f4ee6f1a7bb4ac8b18a21346fa852ffeac91e104ec7730e788ec6bb0193764917d778eba170c
+  data.tar.gz: dc94179cadf65f94b31597b5e2ffa8eb47d7cd4e8353152c24cdb195cd6ff0702a2cb93b35802c9f0f77fcb77f242a53e9e9984416e5bf0209add69874f036f6

data/Rakefile

@@ -85,7 +85,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.48.0",
+      :version => "2.48.1",
       :compression_method => "xz",
       :windows => {
         :need_autoreconf => true,
@@ -168,7 +168,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.48.0",
+      :version => "2.48.2",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/glib2/extconf.rb

@@ -47,7 +47,6 @@ have_func("ruby_set_current_source", ruby_header)
 have_func("rb_thread_call_without_gvl", ruby_header)
 have_func("ruby_native_thread_p", ruby_header)
 have_func("rb_thread_call_with_gvl", ruby_header)
-have_func("rb_str_new_cstr", ruby_header)
 have_func("rb_gc_register_mark_object", ruby_header)
 have_func("rb_exc_new_str", ruby_header)
 

data/ext/glib2/rbglib-variant-type.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-2016  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
@@ -286,10 +286,14 @@ Init_glib_variant_type(void)
         DEF_TYPE(DICT_ENTRY);
         DEF_TYPE(DICTIONARY);
         DEF_TYPE(STRING_ARRAY);
+#  if GLIB_CHECK_VERSION(2, 30, 0)
         DEF_TYPE(OBJECT_PATH_ARRAY);
+#  endif
         DEF_TYPE(BYTESTRING);
         DEF_TYPE(BYTESTRING_ARRAY);
+#  if GLIB_CHECK_VERSION(2, 30, 0)
         DEF_TYPE(VARDICT);
+#  endif
 
 #undef DEF_TYPE
     }

data/ext/glib2/rbglib-variant.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-2016  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
@@ -174,9 +174,7 @@ rg_ruby_to_variant(VALUE rb_value, VALUE rb_variant_type)
     } else if (g_variant_type_equal(variant_type, G_VARIANT_TYPE_VARIANT)) {
         return g_variant_new_variant(rbg_variant_from_ruby(rb_value));
     } else if (g_variant_type_equal(variant_type,
-                                    G_VARIANT_TYPE_STRING_ARRAY) ||
-               g_variant_type_equal(variant_type,
-                                    G_VARIANT_TYPE_OBJECT_PATH_ARRAY)) {
+                                    G_VARIANT_TYPE_STRING_ARRAY)) {
         const gchar **strings;
         gssize length;
         if (NIL_P(rb_value)) {
@@ -192,11 +190,27 @@ rg_ruby_to_variant(VALUE rb_value, VALUE rb_variant_type)
                 strings[i] = RVAL2CSTR_ACCEPT_NIL(rb_string);
             }
         }
-        if (g_variant_type_equal(variant_type, G_VARIANT_TYPE_STRING_ARRAY)) {
-            return g_variant_new_strv(strings, length);
+        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;
+        gssize length;
+        if (NIL_P(rb_value)) {
+            paths = NULL;
+            length = 0;
         } else {
-            return g_variant_new_objv(strings, length);
+            gssize i;
+
+            length = RARRAY_LEN(rb_value);
+            paths = ALLOCA_N(const gchar *, length);
+            for (i = 0; i < length; i++) {
+                VALUE rb_path = RARRAY_PTR(rb_value)[i];
+                paths[i] = RVAL2CSTR_ACCEPT_NIL(rb_path);
+            }
         }
+        return g_variant_new_objv(paths, length);
+#endif
     } else if (g_variant_type_equal(variant_type, G_VARIANT_TYPE_ARRAY)) {
         int i;
         GVariantBuilder builder;

data/ext/glib2/rbglib.c

@@ -34,10 +34,8 @@ rbg_rval2cstr(VALUE *str)
 {
     StringValue(*str);
 
-#ifdef HAVE_RUBY_ENCODING_H
     if (rb_enc_get(*str) != rb_utf8_encoding())
         *str = rb_str_export_to_enc(*str, rb_utf8_encoding());
-#endif
 
     return StringValueCStr(*str);
 }
@@ -142,11 +140,7 @@ rbg_cstr2rval_len(const gchar *str, gsize len)
     if (str == NULL)
         return Qnil;
 
-#ifdef HAVE_RUBY_ENCODING_H
     return rb_external_str_new_with_enc(str, len, rb_utf8_encoding());
-#else
-    return rb_str_new(str, len);
-#endif
 }
 
 struct rbg_cstr2rval_len_free_args {
@@ -185,7 +179,6 @@ rbg_cstr2rval_with_encoding(const gchar *str, const gchar *encoding)
     return str != NULL ? CSTR2RVAL_LEN_ENC(str, strlen(str), encoding) : Qnil;
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
 VALUE
 rbg_cstr2rval_len_with_encoding(const gchar *str, gsize len,
                                 const gchar *encoding)
@@ -198,17 +191,6 @@ rbg_cstr2rval_len_with_encoding(const gchar *str, gsize len,
                                             rb_enc_find(encoding) :
                                             rb_utf8_encoding());
 }
-#else
-VALUE
-rbg_cstr2rval_len_with_encoding(const gchar *str, gsize len,
-                                G_GNUC_UNUSED const gchar *encoding)
-{
-    if (str == NULL)
-        return Qnil;
-
-    return rb_str_new(str, len);
-}
-#endif
 
 static VALUE
 rbg_cstr2rval_free_body(VALUE str)
@@ -238,11 +220,8 @@ rbg_cstr2rval_with_free(gchar *str)
     return rbg_cstr2rval_free(str);
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
 static rb_encoding *filename_encoding_if_not_utf8;
-#endif
 
-#ifdef HAVE_RUBY_ENCODING_H
 static VALUE
 rbg_filename_to_ruby_body(VALUE filename)
 {
@@ -267,12 +246,10 @@ rbg_filename_to_ruby_ensure(VALUE filename)
 
     return Qnil;
 }
-#endif
 
 VALUE
 rbg_filename_to_ruby(const gchar *filename)
 {
-#ifdef HAVE_RUBY_ENCODING_H
     gchar *filename_utf8;
     gsize written;
     GError *error = NULL;
@@ -289,15 +266,11 @@ rbg_filename_to_ruby(const gchar *filename)
 
     return rb_ensure(rbg_filename_to_ruby_body, (VALUE)filename_utf8,
                      rbg_filename_to_ruby_ensure, (VALUE)filename_utf8);
-#else
-    return CSTR2RVAL(filename);
-#endif
 }
 
 VALUE
 rbg_filename_to_ruby_free(gchar *filename)
 {
-#ifdef HAVE_RUBY_ENCODING_H
     gchar *filename_utf8;
     gsize written;
 
@@ -318,15 +291,11 @@ rbg_filename_to_ruby_free(gchar *filename)
 
     return rb_ensure(rbg_filename_to_ruby_body, (VALUE)filename_utf8,
                      rbg_filename_to_ruby_ensure, (VALUE)filename_utf8);
-#else
-    return CSTR2RVAL_FREE(filename);
-#endif
 }
 
 gchar *
 rbg_filename_from_ruby(VALUE filename)
 {
-#ifdef HAVE_RUBY_ENCODING_H
     gchar *retval;
     gsize written;
     GError *error = NULL;
@@ -345,9 +314,6 @@ rbg_filename_from_ruby(VALUE filename)
         RAISE_GERROR(error);
 
     return retval;
-#else
-    return g_strdup(RVAL2CSTR(filename));
-#endif
 }
 
 struct rval2strv_args {
@@ -1013,9 +979,7 @@ extern void Init_glib2(void);
 void
 Init_glib2(void)
 {
-#ifdef HAVE_RUBY_ENCODING_H
     const gchar **filename_charsets;
-#endif
 
     id_inspect = rb_intern("inspect");
 
@@ -1096,7 +1060,6 @@ Init_glib2(void)
     rb_define_const(RG_TARGET_NAMESPACE, "SEARCHPATH_SEPARATOR", CSTR2RVAL(G_SEARCHPATH_SEPARATOR_S));
 
     /* discover and store glib filename encoding */
-#ifdef HAVE_RUBY_ENCODING_H
     if (g_get_filename_charsets(&filename_charsets)
         || filename_charsets == NULL
         || filename_charsets[0] == NULL
@@ -1108,7 +1071,6 @@ Init_glib2(void)
     } else {
         filename_encoding_if_not_utf8 = rb_enc_find(filename_charsets[0]);
     }
-#endif
 
 /* Don't implement them.
 #define     G_DIR_SEPARATOR_S

data/ext/glib2/rbglib.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2002-2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2016  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 0
-#define RBGLIB_MICRO_VERSION 8
+#define RBGLIB_MICRO_VERSION 9
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbglib_convert.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2016  Ruby-GNOME2 Project Team
  *  Copyright (C) 2009  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003 KUBO Takehiro
  *
@@ -49,7 +49,6 @@ static VALUE
 rg_s_locale_to_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     GError *err = NULL;
-    VALUE s = Qnil;
     gchar* ret;
     gsize written;
 
@@ -59,9 +58,7 @@ rg_s_locale_to_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 
     if (err != NULL)
         RAISE_GERROR(err);
-    s = rb_str_new(ret, written);
-    g_free(ret);
-    return s;
+    return CSTR2RVAL_LEN_FREE(ret, written);
 }
 
 static VALUE
@@ -87,7 +84,6 @@ static VALUE
 rg_s_filename_to_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     GError *err = NULL;
-    VALUE s = Qnil;
     gchar* ret;
     gsize written;
 
@@ -97,9 +93,7 @@ rg_s_filename_to_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 
     if (err != NULL)
         RAISE_GERROR(err);
-    s = rb_str_new(ret, written);
-    g_free(ret);
-    return s;
+    return CSTR2RVAL_LEN_FREE(ret, written);
 }
 
 static VALUE

data/ext/glib2/rbglib_matchinfo.c

@@ -22,6 +22,7 @@
 #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)
 {
@@ -157,10 +158,12 @@ 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);
@@ -176,4 +179,5 @@ 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_regex.c

@@ -136,6 +136,7 @@ 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)
 {
@@ -190,6 +191,7 @@ 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)
@@ -203,6 +205,7 @@ 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)
 {
@@ -214,6 +217,7 @@ rg_max_lookbehind(VALUE self)
 {
     return INT2NUM(g_regex_get_max_lookbehind(_SELF(self)));
 }
+#endif
 
 static VALUE
 rg_string_number(VALUE self, VALUE string)
@@ -221,6 +225,7 @@ 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)
 {
@@ -418,7 +423,7 @@ 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)
@@ -466,14 +471,20 @@ 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/rbgobj_object.c

@@ -302,7 +302,7 @@ rbgobj_gobject_new(GType gtype, VALUE params_hash)
         size_t param_size;
         struct param_setup_arg arg;
 
-        param_size = NUM2INT(rb_funcall(params_hash, rb_intern("length"), 0)); 
+        param_size = NUM2INT(rb_funcall(params_hash, rb_intern("length"), 0));
 
         arg.param_size = param_size;
         arg.gclass = G_OBJECT_CLASS(g_type_class_ref(gtype));
@@ -621,19 +621,97 @@ rg_type_name(VALUE self)
 }
 
 #if GLIB_CHECK_VERSION(2, 26, 0)
+typedef struct {
+    VALUE transform_from_callback;
+    VALUE transform_to_callback;
+    VALUE self;
+} RGBindPropertyCallbackData;
+
+static gboolean
+rg_bind_property_transform_to_callback(G_GNUC_UNUSED GBinding *binding,
+                                       const GValue *from_value,
+                                       GValue *to_value,
+                                       gpointer user_data)
+{
+    RGBindPropertyCallbackData *data = (RGBindPropertyCallbackData *)user_data;
+    VALUE proc;
+    VALUE rb_from_value;
+    VALUE rb_to_value;
+
+    proc = data->transform_to_callback;
+    if (NIL_P(proc))
+        return FALSE;
+
+    rb_from_value = rbgobj_gvalue_to_rvalue(from_value);
+    rb_to_value = rbgobj_gvalue_to_rvalue(to_value);
+    rb_to_value = rb_funcall(proc, rb_intern("call"), 1, rb_from_value);
+    rbgobj_rvalue_to_gvalue(rb_to_value, to_value);
+    return TRUE;
+}
+
+static gboolean
+rg_bind_property_transform_from_callback(G_GNUC_UNUSED GBinding *binding,
+                                         const GValue *from_value,
+                                         GValue *to_value,
+                                         gpointer user_data)
+{
+    RGBindPropertyCallbackData *data = (RGBindPropertyCallbackData *)user_data;
+    VALUE proc;
+    VALUE rb_from_value;
+    VALUE rb_to_value;
+
+    proc = data->transform_from_callback;
+    if (NIL_P(proc))
+        return FALSE;
+
+    rb_from_value = rbgobj_gvalue_to_rvalue(from_value);
+    rb_to_value = rbgobj_gvalue_to_rvalue(to_value);
+    rb_to_value = rb_funcall(proc, rb_intern("call"), 1, rb_from_value);
+    rbgobj_rvalue_to_gvalue(rb_to_value, to_value);
+    return TRUE;
+}
+
+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);
+}
+
 static VALUE
-rg_bind_property(VALUE self,
-                 VALUE rb_source_property,
-                 VALUE rb_target,
-                 VALUE rb_target_property,
-                 VALUE rb_flags)
+rg_bind_property(gint argc, VALUE *argv, VALUE self)
 {
+    VALUE rb_source_property;
+    VALUE rb_target;
+    VALUE rb_target_property;
+    VALUE rb_flags;
+    VALUE rb_options;
+    VALUE rb_transform_to;
+    VALUE rb_transform_from;
+
     gpointer source;
     const gchar *source_property;
     gpointer target;
     const gchar *target_property;
     GBindingFlags flags;
     GBinding *binding;
+    GBindingTransformFunc transform_to = NULL;
+    GBindingTransformFunc transform_from = NULL;
+
+    rb_scan_args(argc, argv, "41", &rb_source_property, &rb_target,
+                 &rb_target_property, &rb_flags, &rb_options);
+
+    rbg_scan_options(rb_options,
+                     "transform_to", &rb_transform_to,
+                     "transform_from", &rb_transform_from,
+                     NULL);
 
     source = RVAL2GOBJ(self);
     source_property = RVAL2CSTR(rb_source_property);
@@ -641,9 +719,33 @@ rg_bind_property(VALUE self,
     target_property = RVAL2CSTR(rb_target_property);
     flags = RVAL2GBINDINGFLAGS(rb_flags);
 
-    binding = g_object_bind_property(source, source_property,
-                                     target, target_property,
-                                     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->self = self;
+        data->transform_to_callback = rb_transform_to;
+        data->transform_from_callback = rb_transform_from;
+        binding = g_object_bind_property_full(source, source_property,
+                                              target, target_property,
+                                              flags, transform_to,
+                                              transform_from,
+                                              (gpointer)data,
+                                              rg_destroy_bind_property_full_data);
+    } else {
+        binding = g_object_bind_property(source, source_property,
+                                         target, target_property,
+                                         flags);
+    }
 
     return GOBJ2RVAL(binding);
 }
@@ -882,7 +984,7 @@ Init_gobject_gobject(void)
     RG_DEF_METHOD(type_name, 0);
 
 #if GLIB_CHECK_VERSION(2, 26, 0)
-    RG_DEF_METHOD(bind_property, 4);
+    RG_DEF_METHOD(bind_property, -1);
     G_DEF_CLASS(G_TYPE_BINDING_FLAGS, "BindingFlags", mGLib);
 #endif