glib2 1.0.3 → 1.1.0

data/ext/glib2/rbgobj_valuearray.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobj_valuearray.c -
-
-  $Author: mutoh $
-  $Date: 2006/05/17 14:00:24 $
-
-  Copyright (C) 2006  Sjoerd Simons
-**********************************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Sjoerd Simons
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "rbgprivate.h"
 
@@ -28,11 +38,42 @@ value_array_to_ruby(const GValue *from)
     return ary;
 }
 
+struct value_array_from_ruby_args {
+    VALUE ary;
+    long n;
+    GValueArray *result;
+};
+
+static VALUE
+value_array_from_ruby_body(VALUE value)
+{
+    long i;
+    struct value_array_from_ruby_args *args = (struct value_array_from_ruby_args *)value;
+
+    for (i = 0; i < args->n; i++) {
+        GValue v = G_VALUE_INIT;
+
+        g_value_init(&v, RVAL2GTYPE(RARRAY_PTR(args->ary)[i]));
+        rbgobj_rvalue_to_gvalue(RARRAY_PTR(args->ary)[i], &v);
+
+        g_value_array_append(args->result, &v);
+    }
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+value_array_from_ruby_rescue(VALUE value)
+{
+    g_value_array_free(((struct value_array_from_ruby_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
 static void
 value_array_from_ruby(const VALUE from, GValue *to)
 {
-    int i;
-    GValueArray *array;
+    struct value_array_from_ruby_args args;
 
     if (NIL_P(from)) {
         g_value_set_boxed(to, NULL);
@@ -40,23 +81,18 @@ value_array_from_ruby(const VALUE from, GValue *to)
         return;
     }
 
-    Check_Type(from, T_ARRAY);
-
-    array = g_value_array_new(RARRAY_LEN(from));
+    args.ary = rb_ary_to_ary(from);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_value_array_new(args.n);
 
-    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);
-    }
+    rb_rescue(value_array_from_ruby_body, (VALUE)&args,
+              value_array_from_ruby_rescue, (VALUE)&args);
 
-    g_value_set_boxed(to, array);
+    g_value_set_boxed(to, args.result);
 }
 
 void
-Init_gobject_value_array()
+Init_gobject_value_array(void)
 {
     /* ValueArray is treated as Array */
     rbgobj_register_g2r_func(G_TYPE_VALUE_ARRAY, value_array_to_ruby);

data/ext/glib2/rbgobj_valuetypes.c

@@ -1,16 +1,26 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobj_valuetypes.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:07 $
-
-  Copyright (C) 2002,2003  Masahiro Sakai
-
-**********************************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003  Masahiro Sakai
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "rbgprivate.h"
+#include "rbgobject.h"
 #ifdef RBGOBJ_USE_DLPTR
 #include "dl.h"
 #endif
@@ -98,7 +108,7 @@ ptr_hash(VALUE self)
 #endif
 
 static void
-Init_gtype_pointer()
+Init_gtype_pointer(void)
 {
     VALUE cPtr = G_DEF_CLASS(G_TYPE_POINTER, "Pointer", mGLib);
     rb_define_singleton_method(cPtr, "gtype", ptr_s_gtype, 1);
@@ -122,9 +132,9 @@ typedef struct {
 } boxed_ruby_value_counter;
 
 static void
-boxed_ruby_value_counter_mark(gpointer       key,
-                              gpointer       value,
-                              gpointer       user_data)
+boxed_ruby_value_counter_mark(G_GNUC_UNUSED gpointer key,
+                              gpointer value,
+                              G_GNUC_UNUSED gpointer user_data)
 {
     boxed_ruby_value_counter* counter = value;
     if (counter->ref_count)
@@ -205,7 +215,7 @@ value_transform_any_ruby(const GValue *src_value,
 }
 
 GType
-rbgobj_ruby_value_get_type()
+rbgobj_ruby_value_get_type(void)
 {
   static GType our_type = 0;
 
@@ -267,7 +277,7 @@ ruby_value_r2g(VALUE from, GValue* to)
 }
 
 static void
-Init_boxed_ruby_value()
+Init_boxed_ruby_value(void)
 {
     boxed_ruby_value_table = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free);
 
@@ -284,7 +294,7 @@ Init_boxed_ruby_value()
 /**********************************************************************/
 
 void
-Init_gobject_gvaluetypes()
+Init_gobject_gvaluetypes(void)
 {
     Init_gtype_pointer();
     Init_boxed_ruby_value();

data/ext/glib2/rbgobject.c

@@ -1,21 +1,27 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobject.c -
-
-  $Author: ktou $
-  $Date: 2007/10/03 12:48:55 $
-
-  Copyright (C) 2003-2006  Ruby-GNOME2 Project Team
-  Copyright (C) 2002,2003  Masahiro Sakai
-
-  This file is derived from rbgtkobject.c in Ruby/Gtk distribution.
-  rbgtkobject.c -
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-
-**********************************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003-2006  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003  Masahiro Sakai
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "ruby.h"
 #include "rbgprivate.h"
@@ -328,29 +334,9 @@ rbgobj_define_property_accessors(VALUE klass)
 
 /**********************************************************************/
 
-void 
-Init_gobject()
+void
+Init_gobject(void)
 {
-    extern void Init_gobject_convert();
-    extern void Init_gobject_gtype();
-    extern void Init_gobject_typeinterface();
-    extern void Init_gobject_typeinstance();
-    extern void Init_gobject_gvalue();
-    extern void Init_gobject_gvaluetypes();
-    extern void Init_gobject_gboxed();
-#if GLIB_CHECK_VERSION(2,6,0)
-    extern void Init_gobject_gstrv();
-#endif
-    extern void Init_gobject_value_array();
-    extern void Init_gobject_genums();
-    extern void Init_gobject_gparam();
-    extern void Init_gobject_gparamspecs();
-    extern void Init_gobject_gclosure();
-    extern void Init_gobject_gobject();
-    extern void Init_gobject_gsignal();
-    extern void Init_gobject_gtypeplugin();
-    extern void Init_gobject_gtypemodule();
-
     /* 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, (gpointer)"class", (gpointer)"class");
@@ -384,7 +370,7 @@ Init_gobject()
     Init_gobject_gstrv();
 #endif
     Init_gobject_value_array();
-    Init_gobject_genums();
+    Init_gobject_genumflags();
     Init_gobject_gparam();
     Init_gobject_gparamspecs();
     Init_gobject_gclosure();

data/ext/glib2/rbgobject.h

@@ -1,15 +1,24 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobject.h -
-
-  $Author: sakai $
-  $Date: 2007/07/19 22:03:44 $
-
-  Copyright (C) 2003,2006  Ruby-GNOME2 Project Team
-  Copyright (C) 2002,2003  Masahiro Sakai
-
-**********************************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003,2006  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003  Masahiro Sakai
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #ifndef __RBGOBJECT_H__
 #define __RBGOBJECT_H__
@@ -87,6 +96,7 @@ RUBY_GLIB2_VAR  ID rbgobj_id_children;
 #define GOBJ2RVAL_UNREF(gobj) (rbgobj_ruby_object_from_instance_with_unref(gobj))
 #define GOBJ2RVALU(gobj) GOBJ2RVAL_UNREF(gobj)
 #define GVAL2RVAL(v)    (rbgobj_gvalue_to_rvalue(v))
+#define GVAL2RVAL_UNSET(v) (rbgobj_gvalue_to_rvalue(v))
 
 #define RVAL2BOXED(obj, gtype)  (rbgobj_boxed_get(obj, gtype))
 #define BOXED2RVAL(cobj, gtype) (rbgobj_make_boxed(cobj, gtype))
@@ -188,6 +198,7 @@ extern void g_rclosure_set_tag(GClosure *closure, const gchar *tag);
 
 /* rbgobj_value.c */
 extern VALUE rbgobj_gvalue_to_rvalue(const GValue* value);
+extern VALUE rbgobj_gvalue_to_rvalue_unset(GValue *value);
 extern void rbgobj_rvalue_to_gvalue(VALUE val, GValue* result);
 extern void rbgobj_initialize_gvalue(GValue *result, VALUE value);
 
@@ -203,7 +214,7 @@ extern VALUE rbgobj_ptr_new(GType type, gpointer ptr);
 extern gpointer rbgobj_ptr2cptr(VALUE ptr);
 
 #define RBGOBJ_TYPE_RUBY_VALUE (rbgobj_ruby_value_get_type())
-extern GType rbgobj_ruby_value_get_type();
+extern GType rbgobj_ruby_value_get_type(void);
 extern VALUE g_value_get_ruby_value(const GValue* value);
 extern void g_value_set_ruby_value(GValue* value, VALUE ruby);
 
@@ -228,20 +239,27 @@ extern void rbgobj_define_const(VALUE mod, const char *name, VALUE value);
 
 
 /* rbglib_mainloop.c */
-#define G_TYPE_MAIN_LOOP (g_main_loop_get_type())
-extern GType g_main_loop_get_type(void);
+#if !GLIB_CHECK_VERSION(2,30,0)
+  #define G_TYPE_MAIN_LOOP (g_main_loop_get_type())
+  extern GType g_main_loop_get_type(void);
+#endif
 
 /* rbglib_maincontext.c */
-#define G_TYPE_MAIN_CONTEXT (g_main_context_get_type())
-#define G_TYPE_SOURCE (g_source_get_type())
+#if !GLIB_CHECK_VERSION(2,30,0)
+  #define G_TYPE_MAIN_CONTEXT (g_main_context_get_type())
+  #define G_TYPE_SOURCE (g_source_get_type())
+  extern GType g_main_context_get_type(void);
+  extern GType g_source_get_type(void);
+#endif
+
 #define G_TYPE_POLL_FD (g_poll_fd_get_type())
-extern GType g_main_context_get_type(void);
-extern GType g_source_get_type(void);
 extern GType g_poll_fd_get_type(void);
 
 /* rbglib_keyfile.c */
-#define G_TYPE_KEY_FILE (g_key_file_get_type())
-extern GType g_key_file_get_type(void);
+#if !GLIB_CHECK_VERSION(2,31,2)
+  #define G_TYPE_KEY_FILE (g_key_file_get_type())
+  extern GType g_key_file_get_type(void);
+#endif
 
 /* rbgobj_convert.c */
 typedef struct {

data/ext/glib2/rbgprivate.h

@@ -1,9 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-  rbgprivate.h -
-
-  Copyright (C) 2007  Ruby-GNOME2 Project Team
-**********************************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  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
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #ifndef __RBGPRIVATE_H__
 #define __RBGPRIVATE_H__
@@ -15,6 +29,10 @@
 #  define rb_errinfo() (ruby_errinfo)
 #endif
 
+#ifndef G_VALUE_INIT
+#  define G_VALUE_INIT { 0, { { 0 } } }
+#endif
+
 G_BEGIN_DECLS
 
 typedef struct {
@@ -30,6 +48,10 @@ typedef struct {
     GType type;
 } boxed_holder;
 
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+G_GNUC_INTERNAL extern GStaticPrivate rg_polling_key;
+#endif
+
 extern VALUE rbgobj_cEnum;
 extern VALUE rbgobj_cFlags;
 extern VALUE rbgobj_cBoxed;
@@ -86,6 +108,66 @@ extern gboolean rbgobj_convert_unref(GType type, gpointer instance);
 
 #define RubyGObjectHookModule "RubyGObjectHook__"
 
+G_GNUC_INTERNAL VALUE rg_enum_resolve_value(VALUE klass, VALUE nick);
+G_GNUC_INTERNAL void rg_enum_add_constants(VALUE mod, GType enum_type, const gchar *strip_prefix);
+G_GNUC_INTERNAL void rg_flags_add_constants(VALUE mod, GType flags_type, const gchar *strip_prefix);
+G_GNUC_INTERNAL char *rg_obj_constant_lookup(const char *name);
+
+G_GNUC_INTERNAL void Init_gutil(void);
+G_GNUC_INTERNAL void Init_gutil_callback(void);
+G_GNUC_INTERNAL void Init_glib_int64(void);
+G_GNUC_INTERNAL void Init_glib_error(void);
+G_GNUC_INTERNAL void Init_glib_threads(void);
+G_GNUC_INTERNAL void Init_glib_convert(void);
+G_GNUC_INTERNAL void Init_glib_messages(void);
+G_GNUC_INTERNAL void Init_glib_spawn(void);
+G_GNUC_INTERNAL void Init_glib_spawnerror(void);
+G_GNUC_INTERNAL void Init_glib_fileutils(void);
+G_GNUC_INTERNAL void Init_glib_utils(void);
+G_GNUC_INTERNAL void Init_glib_i18n(void);
+G_GNUC_INTERNAL void Init_glib_win32(void);
+G_GNUC_INTERNAL void Init_gobject(void);
+G_GNUC_INTERNAL void Init_glib_main_loop(void);
+G_GNUC_INTERNAL void Init_glib_main_context(void);
+G_GNUC_INTERNAL void Init_glib_source(void);
+G_GNUC_INTERNAL void Init_glib_poll_fd(void);
+G_GNUC_INTERNAL void Init_glib_io_channel(void);
+G_GNUC_INTERNAL void Init_glib_io_channelerror(void);
+G_GNUC_INTERNAL void Init_glib_io_channel_win32_socket(void);
+G_GNUC_INTERNAL void Init_glib_shell(void);
+G_GNUC_INTERNAL void Init_glib_shellerror(void);
+G_GNUC_INTERNAL void Init_glib_completion(void);
+G_GNUC_INTERNAL void Init_glib_timer(void);
+G_GNUC_INTERNAL void Init_glib_unicode(void);
+G_GNUC_INTERNAL void Init_glib_utf8(void);
+G_GNUC_INTERNAL void Init_glib_utf16(void);
+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_gobject_convert(void);
+G_GNUC_INTERNAL void Init_gobject_gtype(void);
+G_GNUC_INTERNAL void Init_gobject_typeinterface(void);
+G_GNUC_INTERNAL void Init_gobject_typeinstance(void);
+G_GNUC_INTERNAL void Init_gobject_gvalue(void);
+G_GNUC_INTERNAL void Init_gobject_gvaluetypes(void);
+G_GNUC_INTERNAL void Init_gobject_gboxed(void);
+#if GLIB_CHECK_VERSION(2,6,0)
+G_GNUC_INTERNAL void Init_gobject_gstrv(void);
+#endif
+G_GNUC_INTERNAL void Init_gobject_value_array(void);
+G_GNUC_INTERNAL void Init_gobject_genumflags(void);
+G_GNUC_INTERNAL void Init_gobject_genums(void);
+G_GNUC_INTERNAL void Init_gobject_gflags(void);
+G_GNUC_INTERNAL void Init_gobject_gparam(void);
+G_GNUC_INTERNAL void Init_gobject_gparamspecs(void);
+G_GNUC_INTERNAL void Init_gobject_gclosure(void);
+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_END_DECLS
 
 #endif