glib2 1.1.9-x86-mingw32 → 1.2.0-x86-mingw32

data/Rakefile

@@ -3,21 +3,25 @@
 $LOAD_PATH.unshift("./lib")
 require 'gnome2-raketask'
 
+libffi_lib_dir     = nil
+libffi_include_dir = nil
+
 package = GNOME2Package.new do |_package|
+  libffi_lib_dir     = File.join(_package.win32.absolute_binary_dir, "lib")
+  libffi_include_dir = File.join(_package.win32.absolute_binary_dir, "include")
+
   _package.summary = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
   _package.description = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
   _package.dependency.gem.runtime = [["pkg-config", ">= 0"]]
   _package.dependency.gem.development = [["test-unit", ">= 2"]]
   _package.win32.packages = []
   _package.win32.dependencies = ["zlib", "libffi", "gettext-runtime"]
-  libffi_lib_dir     = File.join(_package.win32.absolute_binary_dir, "lib")
-  libffi_include_dir = File.join(libffi_lib_dir, "libffi-3.0.6", "include")
   _package.win32.build_packages = [
     {
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.35.3",
+      :version => "2.34.3",
       :configure_args => [
         "LIBFFI_CFLAGS=-I#{libffi_include_dir}",
         "LIBFFI_LIBS=-L#{libffi_lib_dir} -lffi",
@@ -57,7 +61,7 @@ package = GNOME2Package.new do |_package|
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.35.3",
+      :version => "2.34.2",
       :configure_args => [
         "--without-libproxy",
         "--without-gnome-proxy",
@@ -68,3 +72,21 @@ package = GNOME2Package.new do |_package|
   ]
 end
 package.define_tasks
+
+namespace :win32 do
+  namespace :libffi do
+    namespace :header do
+      desc "Move libffi headers to include/"
+      task :fix do
+        libffi_version = "libffi-3.0.6"
+        mv(Dir.glob(File.join(libffi_lib_dir, libffi_version, "include", "*.h")),
+           libffi_include_dir)
+        rm_rf(File.join(libffi_lib_dir, libffi_version))
+      end
+    end
+  end
+
+  namespace :downloader do
+    task :after => ["win32:libffi:header:fix"]
+  end
+end

data/ext/glib2/glib2.def

@@ -21,8 +21,11 @@ EXPORTS
 	rbgobj_gobject_initialize
 	rbgobj_boxed_create
 	rbgobj_boxed_get
+	rbgobj_boxed_get_default
 	rbgobj_boxed_not_copy_obj
 	rbgobj_make_boxed
+	rbgobj_make_boxed_raw
+	rbgobj_make_boxed_default
 	rbgobj_add_abstract_but_create_instance_class
 	rbgobj_gtype_get
 	rbgobj_gtype_new
@@ -120,7 +123,6 @@ EXPORTS
 	rbgerr_define_gerror
 	rbgerr_gerror2exception
 	rbgobj_convert_define
-	rbgobj_fund_define_fundamental
 	rbgobj_gc_mark_gvalue
 	rbgobj_gc_mark_instance
 	rbglib_num_to_uint64

data/ext/glib2/rbgcompat.h

@@ -24,21 +24,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct {
-    GType type;
-    VALUE (*get_superclass)(void);
-    void (*type_init_hook)(VALUE);
-    void (*rvalue2gvalue)(VALUE val, GValue *result);
-    VALUE (*gvalue2rvalue)(const GValue *);
-    void (*initialize)(VALUE, gpointer);
-    gpointer (*robj2instance)(VALUE);
-    VALUE (*instance2robj)(gpointer);
-} RGFundamental;
-
-#define G_DEF_FUNDAMENTAL(f) (rbgobj_fund_define_fundamental(f))
-
-extern void rbgobj_fund_define_fundamental(RGFundamental *fundamental);
-
 G_END_DECLS
 
 #endif

data/ext/glib2/rbglib.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2005  Ruby-GNOME2 Project
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -34,8 +34,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define RBGLIB_MAJOR_VERSION 1
-#define RBGLIB_MINOR_VERSION 1
-#define RBGLIB_MICRO_VERSION 9
+#define RBGLIB_MINOR_VERSION 2
+#define RBGLIB_MICRO_VERSION 0
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -55,6 +55,14 @@ extern "C" {
 typedef int GPid;
 #endif
 
+#ifndef G_SOURCE_REMOVE
+#  define G_SOURCE_REMOVE FALSE
+#endif
+
+#ifndef G_SOURCE_CONTINUE
+#  define G_SOURCE_CONTINUE TRUE
+#endif
+
 #define RBG_INSPECT(object) (rbg_rval_inspect(object))
 
 #define RVAL2CSTR(v) (rbg_rval2cstr(&(v)))

data/ext/glib2/rbglib_source.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -171,6 +171,11 @@ Init_glib_source(void)
 
     id_call = rb_intern("call");
 
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "REMOVE", CBOOL2RVAL(G_SOURCE_REMOVE));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "CONTINUE", CBOOL2RVAL(G_SOURCE_CONTINUE));
+
     RG_DEF_METHOD(attach, -1);
 #if GLIB_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD_P(destroyed, 0);

data/ext/glib2/rbgobj_boxed.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -55,14 +55,14 @@ boxed_free(boxed_holder *holder)
 static VALUE
 rbgobj_boxed_s_allocate(VALUE klass)
 {
-    const RGObjClassInfo* cinfo = rbgobj_lookup_class(klass);
-    boxed_holder* holder;
+    const RGObjClassInfo *cinfo = rbgobj_lookup_class(klass);
+    boxed_holder *holder;
     VALUE result;
 
     if (cinfo->gtype == G_TYPE_BOXED)
         rb_raise(rb_eTypeError, "abstract class");
 
-    result = Data_Make_Struct(klass, boxed_holder, 
+    result = Data_Make_Struct(klass, boxed_holder,
                               boxed_mark, boxed_free, holder);
     holder->type  = cinfo->gtype;
     holder->boxed = NULL;
@@ -81,8 +81,8 @@ rg_initialize(VALUE self)
 static VALUE
 rg_inspect(VALUE self)
 {
-    boxed_holder* holder;
-    gchar* s;
+    boxed_holder *holder;
+    gchar *s;
     VALUE result;
 
     Data_Get_Struct(self, boxed_holder, holder);
@@ -102,8 +102,8 @@ rg_inspect(VALUE self)
 static VALUE
 rg_initialize_copy(VALUE self, VALUE orig)
 {
-    boxed_holder* holder1;
-    boxed_holder* holder2;
+    boxed_holder *holder1;
+    boxed_holder *holder2;
 
     if (self == orig) return self;
 
@@ -134,24 +134,21 @@ rbgobj_boxed_create(VALUE klass)
 
 void
 rbgobj_boxed_initialize(VALUE obj, gpointer boxed)
-{ 
-    boxed_holder* holder;
+{
+    boxed_holder *holder;
     Data_Get_Struct(obj, boxed_holder, holder);
     holder->boxed = g_boxed_copy(holder->type, boxed);
     holder->own   = TRUE;
 }
 
 gpointer
-rbgobj_boxed_get(VALUE obj, GType gtype)
+rbgobj_boxed_get_default(VALUE obj, GType gtype)
 {
-    boxed_holder* holder;
-
-    if (NIL_P(obj))
-        return NULL;
+    boxed_holder *holder;
 
     if (!RVAL2CBOOL(rb_obj_is_kind_of(obj, GTYPE2CLASS(gtype))))
         rb_raise(rb_eArgError, "invalid argument %s (expect %s)",
-                 rb_class2name(CLASS_OF(obj)), 
+                 rb_class2name(CLASS_OF(obj)),
                  rb_class2name(GTYPE2CLASS(gtype)));
 
     Data_Get_Struct(obj, boxed_holder, holder);
@@ -161,22 +158,32 @@ rbgobj_boxed_get(VALUE obj, GType gtype)
     return holder->boxed;
 }
 
+gpointer
+rbgobj_boxed_get(VALUE obj, GType gtype)
+{
+    gpointer boxed = NULL;
+
+    if (NIL_P(obj))
+        return NULL;
+
+    if (rbgobj_convert_robj2instance(gtype, obj, &boxed)) {
+        return boxed;
+    }
+
+    return rbgobj_boxed_get_default(obj, gtype);
+}
+
 VALUE
-rbgobj_make_boxed(gpointer p, GType gtype)
+rbgobj_make_boxed_raw(gpointer p, GType gtype, VALUE klass, gint flags)
 {
-    const RGObjClassInfo* cinfo;
     VALUE result;
-    boxed_holder* holder;
+    boxed_holder *holder;
 
-    if (!p)
-        return Qnil;
-
-    cinfo = GTYPE2CINFO(gtype);
-    result = rbgobj_boxed_s_allocate(cinfo->klass);
+    result = rbgobj_boxed_s_allocate(klass);
 
     Data_Get_Struct(result, boxed_holder, holder);
 
-    if (cinfo->flags & RBGOBJ_BOXED_NOT_COPY){
+    if (flags & RBGOBJ_BOXED_NOT_COPY) {
         holder->boxed = p;
         holder->own   = FALSE;
     } else {
@@ -187,43 +194,53 @@ rbgobj_make_boxed(gpointer p, GType gtype)
     return result;
 }
 
+VALUE
+rbgobj_make_boxed_default(gpointer p, GType gtype)
+{
+    const RGObjClassInfo *cinfo;
+
+    cinfo = GTYPE2CINFO(gtype);
+    return rbgobj_make_boxed_raw(p, gtype, cinfo->klass, cinfo->flags);
+}
+
+VALUE
+rbgobj_make_boxed(gpointer p, GType gtype)
+{
+    VALUE result;
+
+    if (!p)
+        return Qnil;
+
+    if (rbgobj_convert_instance2robj(gtype, p, &result)) {
+        return result;
+    }
+
+    return rbgobj_make_boxed_default(p, gtype);
+}
+
 void
 rbgobj_boxed_not_copy_obj(GType gtype)
 {
-    RGObjClassInfo* cinfo = (RGObjClassInfo*)GTYPE2CINFO(gtype);
+    RGObjClassInfo *cinfo = (RGObjClassInfo *)GTYPE2CINFO(gtype);
     cinfo->flags |= RBGOBJ_BOXED_NOT_COPY;
 }
 
 /**********************************************************************/
 
 static VALUE
-boxed_to_ruby(const GValue* from)
+boxed_to_ruby(const GValue *from)
 {
-    gpointer boxed = g_value_get_boxed(from);
-    if (!boxed)
-        return Qnil;
-    else
-        return rbgobj_make_boxed(boxed, G_VALUE_TYPE(from));
+    gpointer boxed;
+    boxed = g_value_get_boxed(from);
+    return rbgobj_make_boxed(boxed, G_VALUE_TYPE(from));
 }
 
 static void
-boxed_from_ruby(VALUE from, GValue* to)
+boxed_from_ruby(VALUE from, GValue *to)
 {
-    boxed_holder* holder;
-
-    if (NIL_P(from)) {
-        g_value_set_boxed(to, NULL);
-        return;
-    }
-
-    Data_Get_Struct(from, boxed_holder, holder);
-
-    if (g_type_is_a(holder->type, G_VALUE_TYPE(to)))
-        g_value_set_boxed(to, holder->boxed);
-    else
-        rb_raise(rb_eRuntimeError, "%s is not a subtype of %s",
-                 g_type_name(holder->type),
-                 g_type_name(G_VALUE_TYPE(to)));
+    gpointer boxed;
+    boxed = rbgobj_boxed_get(from, G_VALUE_TYPE(to));
+    g_value_set_boxed(to, boxed);
 }
 
 /**********************************************************************/

data/ext/glib2/rbgobj_convert.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2006  Sjoerd Simons, Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -24,20 +24,35 @@
 
 static GHashTable *tables, *class_to_g_type_map;
 
+static void
+rg_convert_table_free(gpointer data)
+{
+    RGConvertTable *table = data;
+
+    if (table->notify) {
+        table->notify(table->user_data);
+    }
+    g_free(table);
+}
+
 void
 Init_gobject_convert(void)
 {
-    tables = g_hash_table_new(g_int_hash, g_int_equal);
+    /* TODO: unref the below tables on exit. */
+    tables = g_hash_table_new_full(g_int_hash, g_int_equal, NULL,
+                                   rg_convert_table_free);
     class_to_g_type_map = g_hash_table_new(g_int_hash, g_int_equal);
 }
 
 void
-rbgobj_convert_define(RGConvertTable *table)
+rbgobj_convert_define(const RGConvertTable *table)
 {
-    g_hash_table_insert(tables, &(table->type), table);
-    if (table->klass && !NIL_P(table->klass)) {
+    RGConvertTable *copied_table;
+    copied_table = g_memdup(table, sizeof(RGConvertTable));
+    g_hash_table_insert(tables, &(copied_table->type), copied_table);
+    if (copied_table->klass != Qfalse && !NIL_P(copied_table->klass)) {
         g_hash_table_insert(class_to_g_type_map,
-                            &(table->klass), &(table->type));
+                            &(copied_table->klass), &(copied_table->type));
     }
 }
 
@@ -60,7 +75,7 @@ rbgobj_convert_get_superclass(GType type, VALUE *result)
 
     table = rbgobj_convert_lookup(type);
     if (table && table->get_superclass) {
-        *result = table->get_superclass();
+        *result = table->get_superclass(table->user_data);
         return TRUE;
     }
 
@@ -74,7 +89,7 @@ rbgobj_convert_type_init_hook(GType type, VALUE klass)
 
     table = rbgobj_convert_lookup(type);
     if (table && table->type_init_hook) {
-        table->type_init_hook(klass);
+        table->type_init_hook(klass, table->user_data);
         return TRUE;
     }
 
@@ -88,7 +103,7 @@ rbgobj_convert_rvalue2gvalue(GType type, VALUE value, GValue *result)
 
     table = rbgobj_convert_lookup(type);
     if (table && table->rvalue2gvalue) {
-        table->rvalue2gvalue(value, result);
+        table->rvalue2gvalue(value, result, table->user_data);
         return TRUE;
     }
 
@@ -102,7 +117,7 @@ rbgobj_convert_gvalue2rvalue(GType type, const GValue *value, VALUE *result)
 
     table = rbgobj_convert_lookup(type);
     if (table && table->gvalue2rvalue) {
-        *result = table->gvalue2rvalue(value);
+        *result = table->gvalue2rvalue(value, table->user_data);
         return TRUE;
     }
 
@@ -127,7 +142,7 @@ rbgobj_convert_initialize(GType type, VALUE obj, gpointer cobj)
 
     table = rbgobj_convert_lookup(type);
     if (table && table->initialize) {
-        table->initialize(obj, cobj);
+        table->initialize(obj, cobj, table->user_data);
         return TRUE;
     }
 
@@ -141,7 +156,7 @@ rbgobj_convert_robj2instance(GType type, VALUE obj, gpointer *result)
 
     table = rbgobj_convert_lookup(type);
     if (table && table->robj2instance) {
-        *result = table->robj2instance(obj);
+        *result = table->robj2instance(obj, table->user_data);
         return TRUE;
     }
 
@@ -155,7 +170,7 @@ rbgobj_convert_instance2robj(GType type, gpointer instance, VALUE *result)
 
     table = rbgobj_convert_lookup(type);
     if (table && table->instance2robj) {
-        *result = table->instance2robj(instance);
+        *result = table->instance2robj(instance, table->user_data);
         return TRUE;
     }
 
@@ -169,7 +184,7 @@ rbgobj_convert_unref(GType type, gpointer instance)
 
     table = rbgobj_convert_lookup(type);
     if (table && table->unref) {
-        table->unref(instance);
+        table->unref(instance, table->user_data);
         return TRUE;
     }