glib2 1.0.0-x86-mingw32 → 1.0.1-x86-mingw32

data/ext/glib2/rbgobj_value.c

@@ -302,7 +302,8 @@ rbgobj_gc_mark_gvalue(GValue* value)
 
 /**********************************************************************/
 
-void Init_gobject_gvalue()
+void
+Init_gobject_gvalue()
 {
     id_to_s = rb_intern("to_s");
     qRValueToGValueFunc = g_quark_from_static_string("__ruby_r2g_func__");

data/ext/glib2/rbgobj_valuearray.c

@@ -12,46 +12,51 @@
 #include "rbgprivate.h"
 
 static VALUE
-value_array_to_ruby(const GValue* from)
+value_array_to_ruby(const GValue *from)
 {
     VALUE ary;
-    int i;
-    GValueArray *val_array = (GValueArray*)g_value_get_boxed(from);
-    if (!val_array)
+    guint i;
+
+    GValueArray *array = (GValueArray *)g_value_get_boxed(from);
+    if (array == NULL)
         return Qnil;
   
     ary = rb_ary_new();
-    for (i = 0 ;  i < val_array->n_values ; i++) {
-        rb_ary_push(ary, GVAL2RVAL(g_value_array_get_nth(val_array, i)));
-    }
+    for (i = 0; i < array->n_values; i++)
+        rb_ary_push(ary, GVAL2RVAL(g_value_array_get_nth(array, i)));
+
     return ary;
 }
 
 static void
-value_array_from_ruby(VALUE from, GValue* to)
+value_array_from_ruby(const VALUE from, GValue *to)
 {
     int i;
-    GValueArray * array;
+    GValueArray *array;
 
     if (NIL_P(from)) {
         g_value_set_boxed(to, NULL);
+
         return;
     }
 
     Check_Type(from, T_ARRAY);
 
-    array = g_value_array_new(0);
+    array = g_value_array_new(RARRAY_LEN(from));
 
     for (i = 0; i < RARRAY_LEN(from); i++) {
-      GValue v = { 0, };
-      g_value_init(&v, RVAL2GTYPE(RARRAY_PTR(from)[i]));
-      rbgobj_rvalue_to_gvalue(RARRAY_PTR(from)[i], &v);
-      g_value_array_append(array, &v);
+        GValue v = { 0, };
+        g_value_init(&v, RVAL2GTYPE(RARRAY_PTR(from)[i]));
+        rbgobj_rvalue_to_gvalue(RARRAY_PTR(from)[i], &v);
+
+        g_value_array_append(array, &v);
     }
+
     g_value_set_boxed(to, array);
 }
 
-void Init_gobject_value_array()
+void
+Init_gobject_value_array()
 {
     /* ValueArray is treated as Array */
     rbgobj_register_g2r_func(G_TYPE_VALUE_ARRAY, value_array_to_ruby);

data/ext/glib2/rbgobj_valuetypes.c

@@ -204,7 +204,8 @@ value_transform_any_ruby(const GValue *src_value,
     g_value_set_ruby_value(dest_value, GVAL2RVAL(src_value));
 }
 
-GType rbgobj_ruby_value_get_type()
+GType
+rbgobj_ruby_value_get_type()
 {
   static GType our_type = 0;
 
@@ -229,7 +230,7 @@ GType rbgobj_ruby_value_get_type()
           G_TYPE_PARAM,
           G_TYPE_OBJECT,
       };
-      int i;
+      size_t i;
 
       our_type = g_boxed_type_register_static(
           "VALUE",

data/ext/glib2/rbgobject.c

@@ -250,7 +250,7 @@ rbgobj_define_property_accessors(VALUE klass)
 {
     GType gtype;
     GParamSpec** pspecs = NULL;
-    int i;
+    guint i;
     GString* source;
     guint n_properties = 0;
     gtype = CLASS2GTYPE(klass);
@@ -353,17 +353,17 @@ Init_gobject()
 
     /* Not defined properties. They are already used as methods of Object */
     prop_exclude_list = g_hash_table_new(g_str_hash, g_str_equal);
-    g_hash_table_insert(prop_exclude_list, "class", "class");
-    g_hash_table_insert(prop_exclude_list, "clone", "clone");
-    g_hash_table_insert(prop_exclude_list, "dup", "dup");
-    g_hash_table_insert(prop_exclude_list, "extend", "extend");
-    g_hash_table_insert(prop_exclude_list, "freeze", "freeze");
-    g_hash_table_insert(prop_exclude_list, "hash", "hash");
-    g_hash_table_insert(prop_exclude_list, "method", "method");
-    g_hash_table_insert(prop_exclude_list, "methods", "methods");
-    g_hash_table_insert(prop_exclude_list, "object_id", "object_id");
-    g_hash_table_insert(prop_exclude_list, "taint", "taint");
-    g_hash_table_insert(prop_exclude_list, "untaint", "untaint");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"class", (gpointer)"class");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"clone", (gpointer)"clone");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"dup", (gpointer)"dup");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"extend", (gpointer)"extend");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"freeze", (gpointer)"freeze");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"hash", (gpointer)"hash");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"method", (gpointer)"method");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"methods", (gpointer)"methods");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"object_id", (gpointer)"object_id");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"taint", (gpointer)"taint");
+    g_hash_table_insert(prop_exclude_list, (gpointer)"untaint", (gpointer)"untaint");
 
     /* IDs */
     id_relatives = rb_intern("__relatives__");

data/ext/glib2/rbgprivate.h

@@ -11,6 +11,10 @@
 #include "rbgobject.h"
 #include "glib-enum-types.h"
 
+#ifndef HAVE_RB_ERRINFO
+#  define rb_errinfo() (ruby_errinfo)
+#endif
+
 G_BEGIN_DECLS
 
 typedef struct {

data/ext/glib2/rbgutil.h

@@ -28,6 +28,20 @@ extern "C" {
     "def " name "=(val); set_" name "(val); val; end\n"))
 #define G_DEF_SETTERS(klass) rbgutil_def_setters(klass)
 
+#define G_REPLACE_SET_PROPERTY(klass, name, function, args) \
+    rb_undef_method(klass, "set_" name); \
+    rb_define_method(klass, "set_" name, function, args); \
+    rb_undef_method(klass, name "="); \
+    G_DEF_SETTER(klass, name)
+
+#define G_REPLACE_GET_PROPERTY(klass, name, function, args) \
+    rb_undef_method(klass, name); \
+    rb_define_method(klass, name, function, args)
+
+#define G_REPLACE_ACTION(klass, name, function, args) \
+    rb_undef_method(klass, name); \
+    rb_define_method(klass, name, function, args)
+
 #define G_SET_PROPERTIES(self, hash) (rbgutil_set_properties(self, hash))
 #define G_SET_SYMBOL_PROPERTY(gtype, name) \
      rbgobj_register_property_getter(gtype, name, rbgutil_sym_g2r_func)

data/ext/glib2/rbgutil_callback.c

@@ -12,20 +12,19 @@
 
 #include "rbgprivate.h"
 
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-#ifdef HAVE_IO_H
-#  include <io.h>
-#  define pipe(phandles) _pipe(phandles, 128, _O_BINARY)
+#ifdef G_OS_WIN32
+#  ifdef HAVE_IO_H
+#    include <io.h>
+#    define pipe(phandles) _pipe(phandles, 128, _O_BINARY)
+#  endif
+#else
+#  ifdef HAVE_UNISTD_H
+#    include <unistd.h>
+#  endif
 #endif
 #include <fcntl.h>
 #include <errno.h>
 
-#ifndef HAVE_RB_ERRINFO
-#  define rb_errinfo() (ruby_errinfo)
-#endif
-
 #ifndef HAVE_RUBY_NATIVE_THREAD_P
 #  define ruby_native_thread_p() is_ruby_native_thread()
 #endif
@@ -119,10 +118,18 @@ mainloop(void)
 static void
 queue_callback_request(CallbackRequest *request)
 {
+    ssize_t written;
+
     g_async_queue_push(callback_request_queue, request);
-    write(callback_pipe_fds[1],
-          CALLBACK_PIPE_READY_MESSAGE,
-          CALLBACK_PIPE_READY_MESSAGE_SIZE);
+    written = write(callback_pipe_fds[1],
+                    CALLBACK_PIPE_READY_MESSAGE,
+                    CALLBACK_PIPE_READY_MESSAGE_SIZE);
+    if (written != CALLBACK_PIPE_READY_MESSAGE_SIZE) {
+        rb_warn("couldn't write all callback pipe ready message: "
+                "message-size: %d, written: %" G_GSSIZE_FORMAT,
+                CALLBACK_PIPE_READY_MESSAGE_SIZE,
+                written);
+    }
 }
 
 static VALUE
@@ -211,7 +218,8 @@ rbgutil_stop_callback_dispatch_thread(void)
 #endif
 }
 
-void Init_gutil_callback()
+void
+Init_gutil_callback()
 {
     id_exit_application = rb_intern("exit_application");
     rbgutil_eGLibCallbackNotInitializedError =

data/lib/glib2.rb

@@ -33,29 +33,39 @@ module GLib
   end
 
   def __add_one_arg_setter(klass)
-    #for Instance methods.
-    ary = klass.instance_methods(false)
-    ary.each do |m|
-      if /^set_(.*)/ =~ m and not ary.include? "#{$1}=" and klass.instance_method(m).arity == 1
-	begin
-          klass.module_eval("def #{$1}=(val); set_#{$1}(val); val; end\n")
-        rescue SyntaxError
-          $stderr.print "Couldn't create #{klass}\##{$1}=(v).\n" if $DEBUG
+    # for Instance methods.
+    method_names = klass.instance_methods(false)
+    method_names.each do |method_name|
+      next if /\Aset_/ !~ method_name
+      property_name = $POSTMATCH
+      next if klass.method_defined?("#{property_name}=")
+      next if klass.instance_method(method_name).arity != 1
+      begin
+        klass.module_eval("def #{property_name}=(val); set_#{property_name}(val); val; end\n")
+      rescue SyntaxError
+        if $DEBUG
+          $stderr.puts "Couldn't create #{klass}\##{property_name}=(v)."
         end
       end
     end
-    #for Class methods/Module functions.
-    if Object.method(:methods).arity == -1
-      ary = klass.methods(false)
+
+    # for Class methods/Module functions.
+    if klass.method(:methods).arity == -1
+      method_names = klass.methods(false)
     else
-      ary = klass.methods
-    end
-    ary.each do |m|
-      if /^set_(.*)/ =~ m and not ary.include? "#{$1}=" and klass.method(m).arity == 1
-	begin
-          klass.module_eval("def self.#{$1}=(val); set_#{$1}(val); val; end\n")
-        rescue SyntaxError
-          $stderr.print "Couldn't create #{klass}\##{$1}=(v).\n" if $DEBUG
+      method_names = klass.methods
+    end
+    singleton_klass = (class << klass; self; end)
+    method_names.each do |method_name|
+      next if /\Aset_/ !~ method_name
+      property_name = $POSTMATCH
+      next if singleton_klass.method_defined?("#{property_name}=")
+      next if klass.method(method_name).arity != 1
+      begin
+        klass.module_eval("def self.#{property_name}=(val); set_#{property_name}(val); val; end\n")
+      rescue SyntaxError
+        if $DEBUG
+          $stderr.puts "Couldn't create #{klass}.#{property_name}=(v)."
         end
       end
     end
@@ -83,7 +93,7 @@ base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"
 GLib.prepend_environment_path(vendor_dir + "bin")
 begin
-  major, minor, micro, = RUBY_VERSION.split(/\./)
+  major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/glib2.so"
 rescue LoadError
   require 'glib2.so'

data/lib/mkmf-gnome2.rb

@@ -79,7 +79,9 @@ end
 def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
   begin
     require 'rubygems'
-    gem_spec = Gem.source_index.find_name(target_name).last
+    gem_spec = (Gem::Specification.respond_to?(:find_by_name) ?
+                Gem::Specification.find_by_name(target_name) :
+                Gem.source_index.find_name(target_name)).last
     if gem_spec
       target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
       target_build_dir = target_source_dir
@@ -383,7 +385,9 @@ def check_cairo(options={})
   if rcairo_source_dir.nil?
     begin
       require 'rubygems'
-      cairo_gem_spec = Gem.source_index.find_name("cairo").last
+      cairo_gem_spec = (Gem::Specification.respond_to?(:find_by_name) ?
+                        Gem::Specification.find_by_name('cairo') :
+                        Gem.source_index.find_name('cairo')).last
       if cairo_gem_spec
         rcairo_source_dir = cairo_gem_spec.full_gem_path
       end

data/test/glib-test-init.rb

@@ -1,4 +1,5 @@
 $VERBOSE = true
 
+require "rubygems"
 gem 'test-unit'
 require 'test/unit'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glib2
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: x86-mingw32
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 Z
+date: 2011-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pkg-config