glib2 2.2.3 → 2.2.4

data/ext/glib2/glib-enum-types.h

@@ -0,0 +1,154 @@
+
+/* Generated by glib-mkenums.rb ($Id$) */ 
+
+#ifndef __GLIB_ENUM_TYPES_H__
+#define __GLIB_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* enumerations from "/usr/include/glib-2.0/glib/gvariant.h" */
+GType g_variant_class_get_type (void);
+#define G_TYPE_VARIANT_CLASS (g_variant_class_get_type())
+GType g_variant_parse_error_get_type (void);
+#define G_TYPE_VARIANT_PARSE_ERROR (g_variant_parse_error_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gspawn.h" */
+GType g_spawn_error_get_type (void);
+#define G_TYPE_SPAWN_ERROR (g_spawn_error_get_type())
+GType g_spawn_flags_get_type (void);
+#define G_TYPE_SPAWN_FLAGS (g_spawn_flags_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gkeyfile.h" */
+GType g_key_file_error_get_type (void);
+#define G_TYPE_KEY_FILE_ERROR (g_key_file_error_get_type())
+GType g_key_file_flags_get_type (void);
+#define G_TYPE_KEY_FILE_FLAGS (g_key_file_flags_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gnode.h" */
+GType g_traverse_flags_get_type (void);
+#define G_TYPE_TRAVERSE_FLAGS (g_traverse_flags_get_type())
+GType g_traverse_type_get_type (void);
+#define G_TYPE_TRAVERSE_TYPE (g_traverse_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gshell.h" */
+GType g_shell_error_get_type (void);
+#define G_TYPE_SHELL_ERROR (g_shell_error_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gslice.h" */
+GType g_slice_config_get_type (void);
+#define G_TYPE_SLICE_CONFIG (g_slice_config_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gregex.h" */
+GType g_regex_error_get_type (void);
+#define G_TYPE_REGEX_ERROR (g_regex_error_get_type())
+GType g_regex_compile_flags_get_type (void);
+#define G_TYPE_REGEX_COMPILE_FLAGS (g_regex_compile_flags_get_type())
+GType g_regex_match_flags_get_type (void);
+#define G_TYPE_REGEX_MATCH_FLAGS (g_regex_match_flags_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gmarkup.h" */
+GType g_markup_error_get_type (void);
+#define G_TYPE_MARKUP_ERROR (g_markup_error_get_type())
+GType g_markup_parse_flags_get_type (void);
+#define G_TYPE_MARKUP_PARSE_FLAGS (g_markup_parse_flags_get_type())
+GType g_markup_collect_type_get_type (void);
+#define G_TYPE_MARKUP_COLLECT_TYPE (g_markup_collect_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gtestutils.h" */
+GType g_test_trap_flags_get_type (void);
+#define G_TYPE_TEST_TRAP_FLAGS (g_test_trap_flags_get_type())
+GType g_test_subprocess_flags_get_type (void);
+#define G_TYPE_TEST_SUBPROCESS_FLAGS (g_test_subprocess_flags_get_type())
+GType g_test_log_type_get_type (void);
+#define G_TYPE_TEST_LOG_TYPE (g_test_log_type_get_type())
+GType g_test_file_type_get_type (void);
+#define G_TYPE_TEST_FILE_TYPE (g_test_file_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gfileutils.h" */
+GType g_file_error_get_type (void);
+#define G_TYPE_FILE_ERROR (g_file_error_get_type())
+GType g_file_test_get_type (void);
+#define G_TYPE_FILE_TEST (g_file_test_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gtimezone.h" */
+GType g_time_type_get_type (void);
+#define G_TYPE_TIME_TYPE (g_time_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gdate.h" */
+GType g_date_dm_y_get_type (void);
+#define G_TYPE_DATE_DM_Y (g_date_dm_y_get_type())
+GType g_date_weekday_get_type (void);
+#define G_TYPE_DATE_WEEKDAY (g_date_weekday_get_type())
+GType g_date_month_get_type (void);
+#define G_TYPE_DATE_MONTH (g_date_month_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gunicode.h" */
+GType g_unicode_type_get_type (void);
+#define G_TYPE_UNICODE_TYPE (g_unicode_type_get_type())
+GType g_unicode_break_type_get_type (void);
+#define G_TYPE_UNICODE_BREAK_TYPE (g_unicode_break_type_get_type())
+GType g_unicode_script_get_type (void);
+#define G_TYPE_UNICODE_SCRIPT (g_unicode_script_get_type())
+GType g_normalize_mode_get_type (void);
+#define G_TYPE_NORMALIZE_MODE (g_normalize_mode_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/ghook.h" */
+GType g_hook_flag_mask_get_type (void);
+#define G_TYPE_HOOK_FLAG_MASK (g_hook_flag_mask_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gthread.h" */
+GType g_thread_error_get_type (void);
+#define G_TYPE_THREAD_ERROR (g_thread_error_get_type())
+GType g_once_status_get_type (void);
+#define G_TYPE_ONCE_STATUS (g_once_status_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gstrfuncs.h" */
+GType g_ascii_type_get_type (void);
+#define G_TYPE_ASCII_TYPE (g_ascii_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gmessages.h" */
+GType g_log_level_flags_get_type (void);
+#define G_TYPE_LOG_LEVEL_FLAGS (g_log_level_flags_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gchecksum.h" */
+GType g_checksum_type_get_type (void);
+#define G_TYPE_CHECKSUM_TYPE (g_checksum_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gutils.h" */
+GType g_user_directory_get_type (void);
+#define G_TYPE_USER_DIRECTORY (g_user_directory_get_type())
+GType g_format_size_flags_get_type (void);
+#define G_TYPE_FORMAT_SIZE_FLAGS (g_format_size_flags_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/goption.h" */
+GType g_option_flags_get_type (void);
+#define G_TYPE_OPTION_FLAGS (g_option_flags_get_type())
+GType g_option_arg_get_type (void);
+#define G_TYPE_OPTION_ARG (g_option_arg_get_type())
+GType g_option_error_get_type (void);
+#define G_TYPE_OPTION_ERROR (g_option_error_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gconvert.h" */
+GType g_convert_error_get_type (void);
+#define G_TYPE_CONVERT_ERROR (g_convert_error_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gbookmarkfile.h" */
+GType g_bookmark_file_error_get_type (void);
+#define G_TYPE_BOOKMARK_FILE_ERROR (g_bookmark_file_error_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/gobject/gsignal.h" */
+GType g_signal_flags_get_type (void);
+#define G_TYPE_SIGNAL_FLAGS (g_signal_flags_get_type())
+GType g_connect_flags_get_type (void);
+#define G_TYPE_CONNECT_FLAGS (g_connect_flags_get_type())
+GType g_signal_match_type_get_type (void);
+#define G_TYPE_SIGNAL_MATCH_TYPE (g_signal_match_type_get_type())
+
+G_END_DECLS
+
+#endif /* __GLIB_ENUM_TYPES_H__ */
+
+/* Generated data ends here */
+

data/ext/glib2/rbglib.c

@@ -912,14 +912,14 @@ So they occur "cross-thread violation".
 static gpointer
 my_malloc(gsize n_bytes)
 {
-    /* Should we rescue NoMemoryError? */ 
+    /* Should we rescue NoMemoryError? */
     return ruby_xmalloc(n_bytes);
 }
 
 static gpointer
 my_realloc(gpointer mem, gsize n_bytes)
 {
-    /* Should we rescue NoMemoryError? */ 
+    /* Should we rescue NoMemoryError? */
     return ruby_xrealloc(mem, n_bytes);
 }
 

data/ext/glib2/rbglib.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 2
 #define RBGLIB_MINOR_VERSION 2
-#define RBGLIB_MICRO_VERSION 3
+#define RBGLIB_MICRO_VERSION 4
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/ext/glib2/rbglib2conversions.h

@@ -52,4 +52,6 @@
 #define RVAL2GKEYFILEFLAGS(o)              (RVAL2GFLAGS(o, G_TYPE_KEY_FILE_FLAGS))
 #define GKEYFILEFLAGS2RVAL(o)              (GFLAGS2RVAL(o, G_TYPE_KEY_FILE_FLAGS))
 
+#define RVAL2GFORMATSIZEFLAGS(o)           (RVAL2GFLAGS(o, G_TYPE_FORMAT_SIZE_FLAGS))
+#define GFORMATSIZEFLAGS2RVAL(o)           (GFLAGS2RVAL(o, G_TYPE_FORMAT_SIZE_FLAGS))
 #endif /* __GLIB2CONVERSIONS_H__ */

data/ext/glib2/rbglib_fileutils.c

@@ -57,6 +57,27 @@ rbglib_m_format_size_for_display(G_GNUC_UNUSED VALUE self, VALUE size)
 }
 #endif
 
+#if GLIB_CHECK_VERSION(2, 30, 0)
+static VALUE
+rbglib_m_format_size(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+{
+    VALUE rb_size, rb_options;
+
+    rb_scan_args(argc, argv, "11", &rb_size, &rb_options);
+    if (NIL_P(rb_options)) {
+      return CSTR2RVAL_FREE(g_format_size(NUM2UINT(rb_size)));
+    } else {
+      VALUE rb_flags;
+      rbg_scan_options(rb_options,
+                       "flags", &rb_flags,
+                       NULL);
+
+      return CSTR2RVAL_FREE(g_format_size_full(NUM2UINT(rb_size),
+                                               RVAL2GFORMATSIZEFLAGS(rb_flags)));
+    }
+}
+#endif
+
 void
 Init_glib_fileutils(void)
 {
@@ -91,4 +112,8 @@ Init_glib_fileutils(void)
     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_source.c

@@ -63,6 +63,13 @@ rg_attach(int argc, VALUE *argv, VALUE self)
                                     RVAL2BOXED(context, G_TYPE_MAIN_CONTEXT)));
 }
 
+static VALUE
+rg_destroy(VALUE self)
+{
+    g_source_destroy(_SELF(self));
+    return self;
+}
+
 static VALUE
 rg_destroyed_p(VALUE self)
 {
@@ -101,6 +108,21 @@ 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)
+{
+    return CSTR2RVAL(g_source_get_name(_SELF(self)));
+}
+
+static VALUE
+rg_set_name(VALUE self, VALUE name)
+{
+    g_source_set_name(_SELF(self), RVAL2CSTR(name));
+    return self;
+}
+#endif
+
 static VALUE
 rg_context(VALUE self)
 {
@@ -121,7 +143,7 @@ rg_set_callback(VALUE self)
     G_RELATIVE(self, func);
     g_source_set_callback(_SELF(self),
                           (GSourceFunc)source_func,
-                          (gpointer)func, 
+                          (gpointer)func,
                           (GDestroyNotify)NULL);
     return self;
 }
@@ -132,6 +154,23 @@ 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)
+{
+    gint64 ready_time;
+    ready_time = g_source_get_ready_time(_SELF(self));
+    return LL2NUM(ready_time);
+}
+
+static VALUE
+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)
 {
@@ -166,7 +205,7 @@ gboolean    g_source_remove_by_user_data    (gpointer user_data);
 void
 Init_glib_source(void)
 {
-    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_SOURCE, "Source", mGLib); 
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_SOURCE, "Source", mGLib);
 
     id_call = rb_intern("call");
 
@@ -176,14 +215,23 @@ Init_glib_source(void)
                     "CONTINUE", CBOOL2RVAL(G_SOURCE_CONTINUE));
 
     RG_DEF_METHOD(attach, -1);
+    RG_DEF_METHOD(destroy, 0);
     RG_DEF_METHOD_P(destroyed, 0);
     RG_DEF_METHOD(set_priority, 1);
     RG_DEF_METHOD(priority, 0);
     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)

data/ext/glib2/rbglib_threads.c

@@ -29,7 +29,7 @@ static VALUE
 rg_s_init(VALUE self)
 {
 #ifdef HAVE_G_THREAD_INIT
-#ifdef G_THREADS_ENABLED
+#if defined(G_THREADS_ENABLED) && !GLIB_CHECK_VERSION(2, 32, 0)
     g_thread_init(NULL);
 #endif
 #endif

data/ext/glib2/rbglib_utils.c

@@ -59,7 +59,7 @@ rg_s_getenv(G_GNUC_UNUSED VALUE self, VALUE variable)
 static VALUE
 rg_s_setenv(G_GNUC_UNUSED VALUE self, VALUE variable, VALUE value, VALUE overwrite)
 {
-    return CBOOL2RVAL(g_setenv(RVAL2CSTR(variable), 
+    return CBOOL2RVAL(g_setenv(RVAL2CSTR(variable),
                                RVAL2CSTR_ACCEPT_NIL(value),
                                RVAL2CBOOL(overwrite)));
 }
@@ -277,9 +277,9 @@ static VALUE
 rg_s_check_version_p(G_GNUC_UNUSED VALUE self, VALUE major, VALUE minor, VALUE micro)
 {
     return CBOOL2RVAL(glib_major_version > NUM2UINT(major) ||
-                      (glib_major_version == NUM2UINT(major) && 
+                      (glib_major_version == NUM2UINT(major) &&
                        glib_minor_version > NUM2UINT(minor)) ||
-                      (glib_major_version == NUM2UINT(major) && 
+                      (glib_major_version == NUM2UINT(major) &&
                        glib_minor_version == NUM2UINT(minor) &&
                        glib_micro_version >= NUM2UINT(micro)));
 }
@@ -293,6 +293,11 @@ Init_glib_utils(void)
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, G_TYPE_USER_DIRECTORY, "G_");
 #endif
 
+#if GLIB_CHECK_VERSION(2, 30, 0)
+    G_DEF_CLASS(G_TYPE_FORMAT_SIZE_FLAGS,
+                "FormatSizeFlags", RG_TARGET_NAMESPACE);
+#endif
+
     RG_DEF_SMETHOD(application_name, 0);
     RG_DEF_SMETHOD(set_application_name, 1);
     RG_DEF_SMETHOD(prgname, 0);

data/ext/glib2/rbgobj_convert.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
  *  Copyright (C) 2006  Sjoerd Simons, Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -39,9 +39,9 @@ void
 Init_gobject_convert(void)
 {
     /* TODO: unref the below tables on exit. */
-    tables = g_hash_table_new_full(g_int_hash, g_int_equal, NULL,
+    tables = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL,
                                    rg_convert_table_free);
-    class_to_g_type_map = g_hash_table_new(g_int_hash, g_int_equal);
+    class_to_g_type_map = g_hash_table_new(g_direct_hash, g_direct_equal);
 }
 
 void
@@ -49,17 +49,20 @@ rbgobj_convert_define(const RGConvertTable *table)
 {
     RGConvertTable *copied_table;
     copied_table = g_memdup(table, sizeof(RGConvertTable));
-    g_hash_table_insert(tables, &(copied_table->type), copied_table);
+    g_hash_table_insert(tables,
+                        GUINT_TO_POINTER(copied_table->type),
+                        copied_table);
     if (copied_table->klass != Qfalse && !NIL_P(copied_table->klass)) {
         g_hash_table_insert(class_to_g_type_map,
-                            &(copied_table->klass), &(copied_table->type));
+                            GUINT_TO_POINTER(copied_table->klass),
+                            GUINT_TO_POINTER(copied_table->type));
     }
 }
 
 RGConvertTable *
 rbgobj_convert_lookup(GType type)
 {
-    return g_hash_table_lookup(tables, &type);
+    return g_hash_table_lookup(tables, GUINT_TO_POINTER(type));
 }
 
 gboolean
@@ -128,11 +131,11 @@ GType
 rbgobj_convert_rvalue2gtype(VALUE value)
 {
     VALUE klass;
-    GType *result;
+    gpointer result;
 
     klass = rb_class_of(value);
-    result = g_hash_table_lookup(class_to_g_type_map, &klass);
-    return result ? *result : 0;
+    result = g_hash_table_lookup(class_to_g_type_map, GUINT_TO_POINTER(klass));
+    return GPOINTER_TO_UINT(result);
 }
 
 gboolean

data/lib/glib2/deprecatable.rb

@@ -91,29 +91,33 @@ module GLib
     private
 
     def const_missing(deprecated_const)
-      if new_const = (@@deprecated_const[self] || {})[deprecated_const.to_sym]
-        msg = "#{caller[0]}: '#{[name, deprecated_const].join('::')}' has been deprecated."
-        case new_const
-        when String, Symbol
-          new_const_val = constant_get(new_const)
-          case new_const_val
-          when GLib::Enum, GLib::Flags
-            alt = " or ':#{new_const_val.nick.gsub('-', '_')}'"
-          end
-          warn "#{msg} Use '#{new_const}'#{alt}."
-          return const_set(deprecated_const, new_const_val)
-        when Hash
-          if new_const[:raise]
-            raise DeprecatedError.new("#{msg} #{new_const[:raise]}")
-          elsif new_const[:warn]
-            warn "#{msg} #{new_const[:warn]}"
-          else
-            warn "#{msg} Don't use this constant anymore."
-          end
-          return
+      new_const = (@@deprecated_const[self] || {})[deprecated_const.to_sym]
+      if new_const.nil?
+        return super
+      end
+
+      msg = "#{caller[0]}: '#{[name, deprecated_const].join('::')}' has been deprecated."
+      case new_const
+      when String, Symbol
+        new_const_val = constant_get(new_const)
+        case new_const_val
+        when GLib::Enum, GLib::Flags
+          alt = " or ':#{new_const_val.nick.gsub('-', '_')}'"
+        end
+        warn "#{msg} Use '#{new_const}'#{alt}."
+        return const_set(deprecated_const, new_const_val)
+      when Hash
+        if new_const[:raise]
+          raise DeprecatedError.new("#{msg} #{new_const[:raise]}")
+        elsif new_const[:warn]
+          warn "#{msg} #{new_const[:warn]}"
+        else
+          warn "#{msg} Don't use this constant anymore."
         end
+        return
+      else
+        super
       end
-      raise NameError.new("uninitialized constant #{[self, deprecated_const].join('::')}")
     end
 
     def constant_get(const)