glib2 1.0.3 → 1.1.0

data/ext/glib2/rbgobj_typeinstance.c

@@ -1,39 +1,49 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobj_typeinstance.c -
-
-  $Author: sakai $
-  $Date: 2007/07/04 13:13:19 $
-  created at: Sat May 27 14:18:55 JST 2006
- 
-  Copyright (C) 2002-2006  Ruby-GNOME2 Project Team
-  Copyright (C) 2002,2003  Masahiro Sakai
-
-**********************************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-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
+ */
 
 #include "rbgprivate.h"
 
-VALUE cInstantiatable;
+#define RG_TARGET_NAMESPACE cInstantiatable
+
+VALUE RG_TARGET_NAMESPACE;
 
 typedef void (*ClassInfoCallbackFunc) (gpointer instance,
-				       const RGObjClassInfo *class_info,
-				       gpointer user_data);
+                                       const RGObjClassInfo *class_info,
+                                       gpointer user_data);
 
-static VALUE
-instantiatable_s_allocate(VALUE klass)
+static G_GNUC_NORETURN VALUE
+instantiatable_s_allocate(G_GNUC_UNUSED VALUE klass)
 {
      rb_raise(rb_eTypeError, "abstract class");
 }
 
 static VALUE
-instantiatable_get_gtype(VALUE self)
+rg_gtype(VALUE self)
 {
     return rbgobj_gtype_new(G_TYPE_FROM_INSTANCE(rbgobj_instance_from_ruby_object(self)));
 }
 
-static VALUE
-instantiatable_clone(VALUE self)
+static G_GNUC_NORETURN VALUE
+rg_clone(VALUE self)
 {
     rb_raise(rb_eTypeError, "can't clone %s", rb_class2name(CLASS_OF(self)));
 }
@@ -51,35 +61,35 @@ each_cinfo(gpointer instance, ClassInfoCallbackFunc func, gpointer user_data)
     {
         guint i;
         for (i = 0; i < n_interfaces; i++) {
-	    const RGObjClassInfo *info;
+            const RGObjClassInfo *info;
 
-	    info = GTYPE2CINFO_NO_CREATE(interfaces[i]);
-	    if (info)
-		func(instance, info, user_data);
-	}
+            info = GTYPE2CINFO_NO_CREATE(interfaces[i]);
+            if (info)
+                func(instance, info, user_data);
+        }
     }
     g_free(interfaces);
 
     {
         GType type;
         for (type = gtype; type != G_TYPE_INVALID; type = g_type_parent(type)) {
-	    const RGObjClassInfo *info;
+            const RGObjClassInfo *info;
 
-	    info = GTYPE2CINFO_NO_CREATE(type);
-	    if (info)
-		func(instance, info, user_data);
-	}
+            info = GTYPE2CINFO_NO_CREATE(type);
+            if (info)
+                func(instance, info, user_data);
+        }
     }
 }
 
 static void
-call_cinfo_free(gpointer instance, const RGObjClassInfo *cinfo, gpointer user_data)
+call_cinfo_free(gpointer instance, const RGObjClassInfo *cinfo, G_GNUC_UNUSED gpointer user_data)
 {
     if (cinfo->free) cinfo->free(instance);
 }
 
 static void
-call_cinfo_mark(gpointer instance, const RGObjClassInfo *cinfo, gpointer user_data)
+call_cinfo_mark(gpointer instance, const RGObjClassInfo *cinfo, G_GNUC_UNUSED gpointer user_data)
 {
     if (cinfo->mark) cinfo->mark(instance);
 }
@@ -106,13 +116,13 @@ rbgobj_gc_mark_instance(gpointer instance)
 /**********************************************************************/
 
 void
-Init_gobject_typeinstance()
+Init_gobject_typeinstance(void)
 {
     /* should be renamed to GLib::Instance? */
-    cInstantiatable = rb_define_class_under(mGLib, "Instantiatable", rb_cObject);
-    rb_extend_object(cInstantiatable, mMetaInterface);
+    RG_TARGET_NAMESPACE = rb_define_class_under(mGLib, "Instantiatable", rb_cObject);
+    rb_extend_object(RG_TARGET_NAMESPACE, mMetaInterface);
 
-    rb_define_alloc_func(cInstantiatable, (VALUE(*)_((VALUE)))instantiatable_s_allocate);
-    rb_define_method(cInstantiatable, "gtype", instantiatable_get_gtype, 0);
-    rb_define_method(cInstantiatable, "clone", instantiatable_clone, 0);
-}
+    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_typeinterface.c

@@ -1,24 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobj_typeinterface.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:28 $
-  created at: Sat May 27 16:04:13 JST 2006
-
-  Copyright (C) 2002-2006  Ruby-GNOME2 Project Team
-  Copyright (C) 2002,2003  Masahiro Sakai
-
-**********************************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-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
+ */
 
 #include "rbgprivate.h"
 
+#define RG_TARGET_NAMESPACE mMetaInterface
+
 VALUE rbgobj_mInterface;
-VALUE mMetaInterface;
+VALUE RG_TARGET_NAMESPACE;
 
 static VALUE
-interface_s_append_features(VALUE self, VALUE klass)
+rg_append_features(G_GNUC_UNUSED VALUE self, VALUE klass)
 {
     if (!rb_obj_is_kind_of(klass, cInstantiatable))
         rb_raise(rb_eTypeError, "Not a subclass of GLib::Instantiatable");
@@ -28,7 +38,7 @@ interface_s_append_features(VALUE self, VALUE klass)
 #if GLIB_CHECK_VERSION(2,4,0)
 
 static VALUE
-interface_s_install_property(VALUE self, VALUE pspec_obj)
+rg_install_property(VALUE self, VALUE pspec_obj)
 {
     const RGObjClassInfo* cinfo = rbgobj_lookup_class(self);
     gpointer ginterface;
@@ -47,7 +57,7 @@ interface_s_install_property(VALUE self, VALUE pspec_obj)
 }
 
 static VALUE
-interface_s_property(VALUE self, VALUE property_name)
+rg_property(VALUE self, VALUE property_name)
 {
     gpointer ginterface;
     const char* name;
@@ -82,7 +92,7 @@ interface_s_property(VALUE self, VALUE property_name)
 }
 
 static VALUE
-interface_s_properties(int argc, VALUE* argv, VALUE self)
+rg_properties(int argc, VALUE* argv, VALUE self)
 {
     guint n_properties;
     GParamSpec** props;
@@ -119,9 +129,9 @@ rbgobj_init_interface(VALUE interf)
 {
     static VALUE rb_mGLibInterface = Qnil;
 
-    rb_extend_object(interf, mMetaInterface);
+    rb_extend_object(interf, RG_TARGET_NAMESPACE);
     if (CLASS2GTYPE(interf) == G_TYPE_INTERFACE) {
-	rb_mGLibInterface = interf;
+        rb_mGLibInterface = interf;
     } else {
         rb_extend_object(interf, rb_mGLibInterface);
         rb_include_module(interf, rb_mGLibInterface);
@@ -130,16 +140,16 @@ rbgobj_init_interface(VALUE interf)
 }
 
 void
-Init_gobject_typeinterface()
+Init_gobject_typeinterface(void)
 {
-    mMetaInterface = rb_define_module_under(mGLib, "MetaInterface");
-    rb_define_method(mMetaInterface, "gtype", generic_s_gtype, 0);
-    rb_define_method(mMetaInterface, "append_features", interface_s_append_features, 1);
+    RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "MetaInterface");
+    rb_define_method(RG_TARGET_NAMESPACE, "gtype", generic_s_gtype, 0);
+    RG_DEF_METHOD(append_features, 1);
 #if GLIB_CHECK_VERSION(2,4,0)
-    rb_define_method(mMetaInterface, "install_property", interface_s_install_property, 1);
-    rb_define_method(mMetaInterface, "property", interface_s_property, 1);
-    rb_define_method(mMetaInterface, "properties", interface_s_properties, -1);
+    RG_DEF_METHOD(install_property, 1);
+    RG_DEF_METHOD(property, 1);
+    RG_DEF_METHOD(properties, -1);
 #endif
 
     rbgobj_mInterface = G_DEF_INTERFACE(G_TYPE_INTERFACE, "Interface", mGLib);
-}
+}

data/ext/glib2/rbgobj_typemodule.c

@@ -1,39 +1,49 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobj_typemodule.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:07 $
-  created at: Sat Jul 27 16:56:01 JST 2002
-
-  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"
 
+#define RG_TARGET_NAMESPACE cTypeModule
+
 static VALUE
-use(VALUE self)
+rg_use(VALUE self)
 {
     return CBOOL2RVAL(g_type_module_use(G_TYPE_MODULE(RVAL2GOBJ(self))));
 }
 
 static VALUE
-unuse(VALUE self)
+rg_unuse(VALUE self)
 {
     g_type_module_unuse(G_TYPE_MODULE(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-get_name(VALUE self)
+rg_name(VALUE self)
 {
     return rb_str_new2(G_TYPE_MODULE(RVAL2GOBJ(self))->name);
 }
 
 static VALUE
-set_name(VALUE self, VALUE name)
+rg_operator_set_name(VALUE self, VALUE name)
 {
     g_type_module_set_name(G_TYPE_MODULE(RVAL2GOBJ(self)), StringValuePtr(name));
     return name;
@@ -41,22 +51,22 @@ set_name(VALUE self, VALUE name)
 
 #if 0
 GType    g_type_module_register_type (GTypeModule     *module,
-				      GType            parent_type,
-				      const gchar     *type_name,
-				      const GTypeInfo *type_info,
-				      GTypeFlags       flags);
+                      GType            parent_type,
+                      const gchar     *type_name,
+                      const GTypeInfo *type_info,
+                      GTypeFlags       flags);
 void     g_type_module_add_interface (GTypeModule           *module,
-				      GType                  instance_type,
-				      GType                  interface_type,
-				      const GInterfaceInfo  *interface_info);
+                      GType                  instance_type,
+                      GType                  interface_type,
+                      const GInterfaceInfo  *interface_info);
 #endif
 
 void
-Init_gobject_gtypemodule()
+Init_gobject_gtypemodule(void)
 {
-    VALUE cTypeModule = G_DEF_CLASS(G_TYPE_TYPE_MODULE, "TypeModule", mGLib);
-    rb_define_method(cTypeModule, "use", use, 0);
-    rb_define_method(cTypeModule, "unuse", unuse, 0);
-    rb_define_method(cTypeModule, "name", get_name, 0);
-    rb_define_method(cTypeModule, "name=", set_name, 1);
-}
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_TYPE_MODULE, "TypeModule", mGLib);
+    RG_DEF_METHOD(use, 0);
+    RG_DEF_METHOD(unuse, 0);
+    RG_DEF_METHOD(name, 0);
+    RG_DEF_METHOD_OPERATOR("name=", set_name, 1);
+}

data/ext/glib2/rbgobj_typeplugin.c

@@ -1,47 +1,57 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobj_typeplugin.c -
-
-  $Author: mutoh $
-  $Date: 2003/02/01 16:03:09 $
-  created at: Mon Aug  5 00:42:09 JST 2002
-
-  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"
 
+#define RG_TARGET_NAMESPACE mTypePlugin
+
 static VALUE
-use(VALUE self)
+rg_use(VALUE self)
 {
     g_type_plugin_use(G_TYPE_PLUGIN(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-unuse(VALUE self)
+rg_unuse(VALUE self)
 {
     g_type_plugin_unuse(G_TYPE_PLUGIN(RVAL2GOBJ(self)));
     return self;
 }
 
 #if 0
-void	g_type_plugin_complete_type_info	(GTypePlugin     *plugin,
-						 GType            g_type,
-						 GTypeInfo       *info,
-						 GTypeValueTable *value_table);
-void	g_type_plugin_complete_interface_info	(GTypePlugin     *plugin,
-						 GType            interface_type,
-						 GType            instance_type,
-						 GInterfaceInfo  *info);
+void    g_type_plugin_complete_type_info   (GTypePlugin     *plugin,
+                         GType            g_type,
+                         GTypeInfo       *info,
+                         GTypeValueTable *value_table);
+void    g_type_plugin_complete_interface_info  (GTypePlugin     *plugin,
+                         GType            interface_type,
+                         GType            instance_type,
+                         GInterfaceInfo  *info);
 #endif
 
 void
-Init_gobject_gtypeplugin()
+Init_gobject_gtypeplugin(void)
 {
-    VALUE iTypePlugin = G_DEF_INTERFACE(G_TYPE_TYPE_PLUGIN, "TypePlugin", mGLib);
-    rb_define_method(iTypePlugin, "use", use, 0);
-    rb_define_method(iTypePlugin, "unuse", unuse, 0);
-}
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(G_TYPE_TYPE_PLUGIN, "TypePlugin", mGLib);
+    RG_DEF_METHOD(use, 0);
+    RG_DEF_METHOD(unuse, 0);
+}

data/ext/glib2/rbgobj_value.c

@@ -1,14 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobj_value.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:28 $
-
-  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"
 
@@ -126,6 +135,27 @@ rbgobj_gvalue_to_rvalue(const GValue* value)
     }
 }
 
+static VALUE
+rbgobj_gvalue_to_rvalue_unset_body(VALUE value)
+{
+    return GVAL2RVAL((GValue *)value);
+}
+
+static VALUE
+rbgobj_gvalue_to_rvalue_unset_ensure(VALUE value)
+{
+    g_value_unset((GValue *)value);
+
+    return Qnil;
+}
+
+VALUE
+rbgobj_gvalue_to_rvalue_unset(GValue *value)
+{
+    return rb_ensure(rbgobj_gvalue_to_rvalue_unset_body, (VALUE)value,
+                     rbgobj_gvalue_to_rvalue_unset_ensure, (VALUE)value);
+}
+
 void
 rbgobj_initialize_gvalue(GValue *result, VALUE value)
 {
@@ -303,7 +333,7 @@ rbgobj_gc_mark_gvalue(GValue* value)
 /**********************************************************************/
 
 void
-Init_gobject_gvalue()
+Init_gobject_gvalue(void)
 {
     id_to_s = rb_intern("to_s");
     qRValueToGValueFunc = g_quark_from_static_string("__ruby_r2g_func__");