glib2 3.4.4 → 3.4.8

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/glib2.def

@@ -158,6 +158,7 @@ EXPORTS
 	rbgutil_stop_callback_dispatch_thread
 	rbgutil_string_set_utf8_encoding
 	rbgutil_key_equal
+	rbgerr_ruby_error_quark
 	rbgerr_define_gerror
 	rbgerr_gerror2exception
 	rbgobj_convert_define

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 4
+#define RBGLIB_MICRO_VERSION 8
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC
@@ -222,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_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_messages.c

@@ -70,11 +70,10 @@ rbglib_log_handler(const gchar *log_domain, GLogLevelFlags log_level, const gcha
         if (rb_during_gc()) {
             g_printerr("\tfrom %s:%d\n", rb_sourcefile(), rb_sourceline());
         } else {
-            VALUE backtrace;
-
-            backtrace = rb_funcall(rb_mKernel, rb_intern("caller"), 0);
-            rb_iterate(rb_each, backtrace,
-                       rbg_printerr, Qnil);
+            VALUE backtrace = rb_funcall(rb_mKernel, rb_intern("caller"), 0);
+            ID id_each;
+            CONST_ID(id_each, "each");
+            rb_block_call(backtrace, id_each, 0, NULL, rbg_printerr, Qnil);
         }
     } else {
         g_log_default_handler(log_domain, log_level, message, user_data);

data/ext/glib2/rbgobj_object.c

@@ -364,7 +364,9 @@ static VALUE
 gobj_new_body(VALUE rb_arg)
 {
     struct param_setup_arg *arg = (struct param_setup_arg *)rb_arg;
-    rb_iterate(rb_each, (VALUE)arg->params_hash, _params_setup, (VALUE)arg);
+    ID id_each;
+    CONST_ID(id_each, "each");
+    rb_block_call(arg->params_hash, id_each, 0, NULL, _params_setup, (VALUE)arg);
     return (VALUE)g_object_newv(G_TYPE_FROM_CLASS(arg->gclass),
                                 arg->param_size, arg->params);
 }

data/ext/glib2/rbgobj_signal.c

@@ -26,8 +26,6 @@
 static VALUE RG_TARGET_NAMESPACE;
 VALUE rbgobj_signal_wrap(guint sig_id);
 
-#define default_handler_method_prefix "signal_do_"
-
 /**********************************************************************/
 
 static const rb_data_type_t rg_glib_signal_type = {
@@ -235,20 +233,13 @@ gobj_s_define_signal(int argc, VALUE* argv, VALUE self)
     signal_flags = RVAL2GFLAGS(rbsignal_flags, G_TYPE_SIGNAL_FLAGS);
 
     {
-        VALUE rb_method_name;
-        VALUE proc;
-        ID method_id;
-
-        rb_method_name =
-            rb_str_concat(rb_str_new_cstr(default_handler_method_prefix),
-                          rbsignal_name);
-        method_id = rb_to_id(rb_method_name);
-
-        proc = rb_funcall(mMetaInterface, rb_intern("signal_callback"), 2,
-                          self, ID2SYM(method_id));
-
+        VALUE proc = rb_funcall(mMetaInterface,
+                                rb_intern("signal_callback"),
+                                2,
+                                self,
+                                rbsignal_name);
         class_closure = g_rclosure_new(proc, Qnil, NULL);
-        g_rclosure_set_tag(class_closure, RVAL2CSTR(rb_method_name));
+        g_rclosure_set_tag(class_closure, RVAL2CSTR(rbsignal_name));
     }
 
     return_type = rbgobj_gtype_from_ruby(rbreturn_type);
@@ -722,39 +713,25 @@ gobj_sig_chain_from_overridden(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-gobj_s_method_added(VALUE klass, VALUE id)
+gobj_s_signal_handler_attach(VALUE klass,
+                             VALUE rb_signal,
+                             VALUE rb_handler_name)
 {
-    const RGObjClassInfo* cinfo = rbgobj_lookup_class(klass);
-    const char* name = rb_id2name(SYM2ID(id));
-    const int prefix_len = strlen(default_handler_method_prefix);
-    guint signal_id;
-
-    if (cinfo->klass != klass) return Qnil;
-    if (strncmp(default_handler_method_prefix, name, prefix_len)) return Qnil;
-
-    signal_id = g_signal_lookup(name + prefix_len, cinfo->gtype);
-    if (!signal_id) return Qnil;
-
-    {
-        GSignalQuery query;
-        g_signal_query(signal_id, &query);
-        if (query.itype == cinfo->gtype)
-            return Qnil;
-    }
-
-    {
-        VALUE proc = rb_funcall(mMetaInterface, rb_intern("signal_callback"), 2,
-                                klass, id);
-        GClosure* rclosure = g_rclosure_new(proc, Qnil,
-                                            rbgobj_get_signal_func(signal_id));
-        g_rclosure_attach((GClosure *)rclosure, klass);
-        g_signal_override_class_closure(signal_id, cinfo->gtype, rclosure);
-    }
+    const RGObjClassInfo *cinfo = rbgobj_lookup_class(klass);
+    guint signal_id = rbgobj_signal_get_raw(rb_signal)->signal_id;
+    const gchar *handler_name = RVAL2CSTR(rb_handler_name);
+    VALUE proc = rb_block_proc();
+    GClosure* rclosure = g_rclosure_new(proc,
+                                        Qnil,
+                                        rbgobj_get_signal_func(signal_id));
+    g_rclosure_set_tag(rclosure, handler_name);
+    g_rclosure_attach((GClosure *)rclosure, klass);
+    g_signal_override_class_closure(signal_id, cinfo->gtype, rclosure);
 
     {
         VALUE mod = rb_define_module_under(klass, RubyGObjectHookModule);
         rb_include_module(klass, mod);
-        rbg_define_method(mod, name, gobj_sig_chain_from_overridden, -1);
+        rbg_define_method(mod, handler_name, gobj_sig_chain_from_overridden, -1);
     }
 
     return Qnil;
@@ -1059,6 +1036,8 @@ Init_gobject_gsignal(void)
     rbg_define_method(cInstantiatable, "signal_handler_is_connected?",
                      gobj_sig_handler_is_connected, 1);
 
-    rbg_define_singleton_method(cInstantiatable, "method_added",
-                               gobj_s_method_added, 1);
+    rbg_define_singleton_method(cInstantiatable,
+                                "signal_handler_attach",
+                                gobj_s_signal_handler_attach,
+                                2);
 }

data/ext/glib2/rbgobj_typeinterface.c

@@ -1,7 +1,7 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011,2017  Ruby-GNOME2 Project Team
- *  Copyright (C) 2002-2006  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011,2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2002-2006  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -35,6 +35,41 @@ rg_append_features(G_GNUC_UNUSED VALUE self, VALUE klass)
     return rb_call_super(1, &klass);
 }
 
+static void
+interface_init(G_GNUC_UNUSED gpointer g_iface,
+               G_GNUC_UNUSED gpointer iface_data)
+{
+}
+
+static VALUE
+rg_included(VALUE self, VALUE class_or_module)
+{
+    const GInterfaceInfo interface_info = {
+        interface_init, NULL, NULL
+    };
+    const RGObjClassInfo *interface_cinfo;
+    const RGObjClassInfo *class_cinfo;
+    if (RVAL2CBOOL(rb_obj_is_instance_of(class_or_module, rb_cModule))) {
+        rb_raise(rb_eTypeError,
+                 "GLib::Interface based module (%" PRIsVALUE ") "
+                 "must be included into a class directly: %" PRIsVALUE,
+                 self,
+                 class_or_module);
+    }
+    interface_cinfo = rbgobj_lookup_class(self);
+    class_cinfo = rbgobj_lookup_class(class_or_module);
+    if (class_cinfo->klass != class_or_module) {
+        return Qnil;
+    }
+    if (g_type_is_a(class_cinfo->gtype, interface_cinfo->gtype)) {
+        return Qnil;
+    }
+    g_type_add_interface_static(class_cinfo->gtype,
+                                interface_cinfo->gtype,
+                                &interface_info);
+    return Qnil;
+}
+
 static VALUE
 rg_install_property(VALUE self, VALUE pspec_obj)
 {
@@ -141,6 +176,7 @@ Init_gobject_typeinterface(void)
     RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "MetaInterface");
     rbg_define_method(RG_TARGET_NAMESPACE, "gtype", generic_s_gtype, 0);
     RG_DEF_METHOD(append_features, 1);
+    RG_DEF_METHOD(included, 1);
     RG_DEF_METHOD(install_property, 1);
     RG_DEF_METHOD(property, 1);
     RG_DEF_METHOD(properties, -1);