glib2 2.2.5 → 3.0.1

data/ext/glib2/rbgobj_type.c

@@ -468,7 +468,7 @@ rg_initialize(VALUE self, VALUE type)
     }
 
     if (G_TYPE_INVALID == gtype)
-        rb_raise(rb_eArgError, "invalid type");
+        rb_raise(rb_eArgError, "invalid GType");
 
     rb_ivar_set(self, id_gtype, ULONG2NUM(gtype));
 

data/ext/glib2/rbgobj_typeinstance.c

@@ -106,11 +106,17 @@ rbgobj_instance_call_cinfo_free(gpointer instance)
     each_cinfo(instance, call_cinfo_free, NULL);
 }
 
-void
+gboolean
 rbgobj_gc_mark_instance(gpointer instance)
 {
     VALUE obj = rbgobj_ruby_object_from_instance2(instance, FALSE);
+
+    if (NIL_P(obj)) {
+        return FALSE;
+    }
+
     rb_gc_mark(obj);
+    return TRUE;
 }
 
 /**********************************************************************/
@@ -125,4 +131,4 @@ Init_gobject_typeinstance(void)
     rb_define_alloc_func(RG_TARGET_NAMESPACE, (VALUE(*)_((VALUE)))instantiatable_s_allocate);
     RG_DEF_METHOD(gtype, 0);
     RG_DEF_METHOD(clone, 0);
-}
+}

data/ext/glib2/rbgobj_value.c

@@ -122,6 +122,12 @@ rbgobj_gvalue_to_rvalue(const GValue* value)
                 return func(value);
             }
         }
+      case G_TYPE_VARIANT:
+        {
+            GVariant *variant = g_value_peek_pointer(value);
+            rvalue = rbg_variant_to_ruby(variant);
+            return rvalue;
+        }
       default:
         if (!rbgobj_convert_gvalue2rvalue(fundamental_type, value, &rvalue)) {
             GValueToRValueFunc func;
@@ -191,18 +197,14 @@ rbgobj_initialize_gvalue(GValue *result, VALUE value)
 	    if (RVAL2CBOOL(rb_obj_is_kind_of(value, rbgobj_cEnum))) {
 		type = G_TYPE_ENUM;
 	    }
-	    else if (RVAL2CBOOL(rb_obj_is_kind_of(value, rbgobj_cFlags))) {
-		type = G_TYPE_FLAGS;
-	    }
-	    else if (RVAL2CBOOL(rb_obj_is_kind_of(value, rbgobj_cBoxed))) {
-		type = G_TYPE_BOXED;
+	    else if (RVAL2CBOOL(rb_obj_is_kind_of(value, rbgobj_cFlags)) ||
+                     RVAL2CBOOL(rb_obj_is_kind_of(value, rbgobj_cBoxed)) ||
+                     RVAL2CBOOL(rb_obj_is_kind_of(value, rbgobj_cObject))) {
+		type = RVAL2GTYPE(value);
 	    }
 	    else if (RVAL2CBOOL(rb_obj_is_kind_of(value, rbgobj_cParam))) {
 		type = G_TYPE_PARAM;
 	    }
-	    else if (RVAL2CBOOL(rb_obj_is_kind_of(value, rbgobj_cObject))) {
-		type = G_TYPE_OBJECT;
-	    }
 	    else if (RVAL2CBOOL(rb_obj_is_kind_of(value, rbgobj_mInterface))) {
 		/* should use rbgobj_mMetaInterface? */
 		type = G_TYPE_INTERFACE;
@@ -335,12 +337,18 @@ rbgobj_gc_mark_gvalue(GValue* value)
 /**********************************************************************/
 
 static VALUE
-rg_initialize(VALUE self, VALUE rb_gtype, VALUE rb_value)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     GValue value = G_VALUE_INIT;
+    VALUE rb_gtype;
+    VALUE rb_value;
+
+    rb_scan_args(argc, argv, "11", &rb_gtype, &rb_value);
 
-    g_value_init(&value, NUM2INT(rb_to_int(rb_gtype)));
-    rbgobj_rvalue_to_gvalue(rb_value, &value);
+    g_value_init(&value, NUM2ULONG(rb_to_int(rb_gtype)));
+    if (argc == 2) {
+        rbgobj_rvalue_to_gvalue(rb_value, &value);
+    }
     G_INITIALIZE(self, g_boxed_copy(G_TYPE_VALUE, &value));
     g_value_unset(&value);
 
@@ -388,7 +396,7 @@ Init_gobject_gvalue(void)
     qGValueToRValueFunc = g_quark_from_static_string("__ruby_g2r_func__");
 
     RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_VALUE, "Value", mGLib);
-    RG_DEF_METHOD(initialize, 2);
+    RG_DEF_METHOD(initialize, -1);
     RG_DEF_METHOD(type, 0);
     RG_DEF_METHOD(value, 0);
     RG_DEF_METHOD(to_s, 0);

data/ext/glib2/rbgobject.c

@@ -384,4 +384,6 @@ Init_gobject(void)
 
     Init_gobject_gtypeplugin();
     Init_gobject_gtypemodule();
+
+    Init_gobject_gbinding();
 }

data/ext/glib2/rbgobject.h

@@ -166,7 +166,7 @@ extern void rbgobj_gobject_initialize(VALUE obj, gpointer cobj);
 extern void rbgobj_add_abstract_but_create_instance_class(GType gtype);
 
 /* rbgobj_typeinstance.c */
-extern void rbgobj_gc_mark_instance(gpointer instance);
+extern gboolean rbgobj_gc_mark_instance(gpointer instance);
 
 
 /* rbgobj_type.c */
@@ -229,6 +229,8 @@ extern void g_value_set_ruby_value(GValue* value, VALUE ruby);
 /* rbgobj_object.c */
 extern void rbgobj_register_property_setter(GType gtype, const char* prop_name, RValueToGValueFunc func);
 extern void rbgobj_register_property_getter(GType gtype, const char* prop_name, GValueToRValueFunc func);
+extern void rbgobj_class_init_func(gpointer g_class, gpointer class_data);
+extern void rbgobj_register_type(VALUE klass, VALUE type_name, GClassInitFunc class_init);
 
 /* rbgobj_boxed.c */
 extern VALUE rbgobj_boxed_create(VALUE klass); /* deprecated */
@@ -284,7 +286,7 @@ typedef struct {
     void (*type_init_hook)(VALUE klass, gpointer user_data);
     void (*rvalue2gvalue)(VALUE value, GValue *result, gpointer user_data);
     VALUE (*gvalue2rvalue)(const GValue *value, gpointer user_data);
-    void (*initialize)(VALUE rb_instance, gpointer insntance, gpointer user_data);
+    void (*initialize)(VALUE rb_instance, gpointer instance, gpointer user_data);
     gpointer (*robj2instance)(VALUE rb_instance, gpointer user_data);
     VALUE (*instance2robj)(gpointer instance, gpointer user_data);
     void (*unref)(gpointer instance, gpointer user_data);

data/ext/glib2/rbgprivate.h

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
- *  Copyright (C) 2007  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007-2015  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
@@ -23,7 +22,6 @@
 #define __RBGPRIVATE_H__
 
 #include "rbgobject.h"
-#include "glib-enum-types.h"
 
 #ifndef HAVE_RB_ERRINFO
 #  define rb_errinfo() (ruby_errinfo)
@@ -152,6 +150,8 @@ G_GNUC_INTERNAL void Init_glib_ucs4(void);
 G_GNUC_INTERNAL void Init_glib_unichar(void);
 G_GNUC_INTERNAL void Init_glib_keyfile(void);
 G_GNUC_INTERNAL void Init_glib_bookmark_file(void);
+G_GNUC_INTERNAL void Init_glib_variant_type(void);
+G_GNUC_INTERNAL void Init_glib_variant(void);
 
 G_GNUC_INTERNAL void Init_gobject_convert(void);
 G_GNUC_INTERNAL void Init_gobject_gtype(void);
@@ -172,6 +172,7 @@ G_GNUC_INTERNAL void Init_gobject_gobject(void);
 G_GNUC_INTERNAL void Init_gobject_gsignal(void);
 G_GNUC_INTERNAL void Init_gobject_gtypeplugin(void);
 G_GNUC_INTERNAL void Init_gobject_gtypemodule(void);
+G_GNUC_INTERNAL void Init_gobject_gbinding(void);
 
 G_END_DECLS
 

data/ext/glib2/rbgutil.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2004 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -21,6 +21,8 @@
 
 #include "rbgprivate.h"
 
+#include <string.h>
+
 ID rbgutil_id_module_eval;
 
 static ID id_add_one_arg_setter;
@@ -135,7 +137,7 @@ rbgutil_key_equal(VALUE rb_key, const char *key)
 
 static gboolean
 rbg_interrupt_prepare (G_GNUC_UNUSED GSource *soruce,
-                      G_GNUC_UNUSED gint *timouet)
+                      G_GNUC_UNUSED gint *timeout)
 {
     return rb_thread_interrupted(rb_thread_current());
 }
@@ -158,12 +160,15 @@ rbg_interrupt_dispatch (G_GNUC_UNUSED GSource *soruce,
     }
 }
 
-static GSourceFuncs rbg_interrupt_funcs = {
-    rbg_interrupt_prepare,
-    rbg_interrupt_check,
-    rbg_interrupt_dispatch,
-    NULL
-};
+static GSourceFuncs rbg_interrupt_funcs;
+static void
+rbg_interrupt_funcs_init(void)
+{
+    memset(&rbg_interrupt_funcs, 0, sizeof(GSourceFuncs));
+    rbg_interrupt_funcs.prepare  = rbg_interrupt_prepare;
+    rbg_interrupt_funcs.check    = rbg_interrupt_check;
+    rbg_interrupt_funcs.dispatch = rbg_interrupt_dispatch;
+}
 
 GSource *
 rbg_interrupt_source_new(void)
@@ -171,6 +176,27 @@ rbg_interrupt_source_new(void)
     return g_source_new(&rbg_interrupt_funcs, sizeof(GSource));
 }
 
+gchar *
+rbg_name_to_nick(const gchar *name)
+{
+    gchar *nick, *current;
+
+    nick = g_strdup(name);
+    for (current = nick; *current; current++) {
+        switch (*current) {
+        case '_':
+        case ' ':
+            *current = '-';
+            break;
+        default:
+            *current = g_ascii_tolower(*current);
+            break;
+        }
+    }
+
+    return nick;
+}
+
 void
 Init_gutil(void)
 {
@@ -180,4 +206,6 @@ Init_gutil(void)
     id_add_one_arg_setter = rb_intern("__add_one_arg_setter");
     id_allocate = rb_intern("allocate");
     id_equal = rb_intern("==");
+
+    rbg_interrupt_funcs_init();
 }

data/ext/glib2/rbgutil.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -107,6 +107,8 @@ extern gboolean rbgutil_key_equal(VALUE rb_string, const char *key);
 extern const gchar *rbg_inspect(VALUE object);
 extern GSource *rbg_interrupt_source_new(void);
 
+extern gchar *rbg_name_to_nick(const gchar *name);
+
 /*< protected >*/
 RUBY_GLIB2_VAR ID rbgutil_id_module_eval;
 extern void rbgutil_glibid_r2g_func(VALUE from, GValue* to);

data/ext/glib2/rbgutil_list.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2015  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
@@ -171,3 +171,99 @@ rbg_gslist2rval_with_type(GSList *const list, RBGRValueFuncWithType conv, GType
                      gslist2rval_ensure, (VALUE)&args);
 }
 
+struct rval2glist_args {
+    GList *list;
+    VALUE rb_array;
+};
+
+static VALUE
+rval2glist_body(VALUE data)
+{
+    struct rval2glist_args *args = (struct rval2glist_args *)data;
+    VALUE rb_array;
+    int i, n;
+
+    rb_array = rbg_to_array(args->rb_array);
+    n = RARRAY_LEN(rb_array);
+    for (i = 0; i < n; i++) {
+        VALUE rb_element = RARRAY_CONST_PTR(rb_array)[i];
+        args->list = g_list_append(args->list, RVAL2GOBJ(rb_element));
+    }
+
+    return Qnil;
+}
+
+static VALUE
+rval2glist_rescue(VALUE data, VALUE e)
+{
+    struct rval2glist_args *args = (struct rval2glist_args *)data;
+
+    g_list_free(args->list);
+    args->list = NULL;
+
+    rb_exc_raise(e);
+
+    return Qnil;
+}
+
+GList *
+rbg_rval2glist(VALUE rb_array)
+{
+    struct rval2glist_args args;
+    args.list = NULL;
+    args.rb_array = rb_array;
+
+    rb_rescue(rval2glist_body, (VALUE)&args,
+              rval2glist_rescue, (VALUE)&args);
+
+    return args.list;
+}
+
+struct rval2gslist_args {
+    GSList *list;
+    VALUE rb_array;
+};
+
+static VALUE
+rval2gslist_body(VALUE data)
+{
+    struct rval2gslist_args *args = (struct rval2gslist_args *)data;
+    VALUE rb_array;
+    int i, n;
+
+    rb_array = rbg_to_array(args->rb_array);
+    n = RARRAY_LEN(rb_array);
+    for (i = 0; i < n; i++) {
+        VALUE rb_element = RARRAY_CONST_PTR(rb_array)[i];
+        args->list = g_slist_append(args->list, RVAL2GOBJ(rb_element));
+    }
+
+    return Qnil;
+}
+
+static VALUE
+rval2gslist_rescue(VALUE data, VALUE e)
+{
+    struct rval2gslist_args *args = (struct rval2gslist_args *)data;
+
+    g_slist_free(args->list);
+    args->list = NULL;
+
+    rb_exc_raise(e);
+
+    return Qnil;
+}
+
+GSList *
+rbg_rval2gslist(VALUE rb_array)
+{
+    struct rval2gslist_args args;
+    args.list = NULL;
+    args.rb_array = rb_array;
+
+    rb_rescue(rval2gslist_body, (VALUE)&args,
+              rval2gslist_rescue, (VALUE)&args);
+
+    return args.list;
+}
+

data/ext/glib2/rbgutil_list.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2015  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
@@ -67,6 +67,12 @@ G_BEGIN_DECLS
         rbg_gslist2rval_with_type(list, (RBGRValueFuncWithType)rbgobj_make_boxed, gtype, \
                                   (GFreeFunc)free_list, (GFreeFunc)free_elem)
 
+#define RVAL2GOBJGLIST(rb_array)                \
+    rbg_rval2glist(rb_array)
+#define RVAL2GOBJGSLIST(rb_array)               \
+    rbg_rval2gslist(rb_array)
+
+
 typedef VALUE (*RBGRValueFunc)(gpointer obj);
 typedef VALUE (*RBGRValueFuncWithType)(gpointer obj, GType gtype);
 
@@ -79,6 +85,9 @@ extern VALUE rbg_glist2rval_with_type(GList *const list, RBGRValueFuncWithType c
 extern VALUE rbg_gslist2rval_with_type(GSList *const list, RBGRValueFuncWithType conv, GType gtype,
                                        GFreeFunc free_list, GFreeFunc free_elem);
 
+extern GList *rbg_rval2glist(VALUE rb_array);
+extern GSList *rbg_rval2gslist(VALUE rb_array);
+
 G_END_DECLS
 
 #endif /* __RBGUTIL_LIST_H__ */

data/lib/glib2/deprecatable.rb

@@ -14,7 +14,7 @@ module GLib
     end
 
     def define_deprecated_enums(enums, prefix = nil)
-      enums = module_eval(enums.to_s) rescue return
+      enums = resolve_constant_name(enums.to_s)
       enums.constants.each do |const|
         deprecated_const = prefix ? "#{prefix}_#{const}" : const
         new_const = [enums, const].join('::')
@@ -33,7 +33,7 @@ module GLib
 
     def define_deprecated_method_by_hash_args(deprecated_method, old_args, new_args, req_argc = 0, &block)
       klass = self
-      alias_name = "__deprecatable_#{deprecated_method}__"
+      alias_name = "__deprecatable_#{object_id}_#{deprecated_method}__"
       alias_method alias_name, deprecated_method
       private alias_name
 
@@ -99,7 +99,7 @@ module GLib
       msg = "#{caller[0]}: '#{[name, deprecated_const].join('::')}' has been deprecated."
       case new_const
       when String, Symbol
-        new_const_val = constant_get(new_const)
+        new_const_val = resolve_constant_name(new_const)
         case new_const_val
         when GLib::Enum, GLib::Flags
           alt = " or ':#{new_const_val.nick.gsub('-', '_')}'"
@@ -120,8 +120,23 @@ module GLib
       end
     end
 
-    def constant_get(const)
-      const.split('::').inject(Object){|r, c| r.const_get(c)}
+    def resolve_constant_name(name)
+      name.to_s.split("::").inject(nil) do |context, local_name|
+        if context.nil?
+          candidates = []
+          candidate_context = ::Object
+          self.to_s.split("::").each do |candidate_name|
+            candidate = candidate_context.const_get(candidate_name)
+            candidates.unshift(candidate)
+            candidate_context = candidate
+          end
+          context = candidates.find do |candidate|
+            candidate.const_defined?(local_name)
+          end
+          context ||= ::Object
+        end
+        context.const_get(local_name)
+      end
     end
 
     def __define_deprecated_method__(type, deprecated_method, new_method = {}, &block)