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

data/ext/glib2/rbgobj_object.c

@@ -184,7 +184,7 @@ gobj_mark(gpointer ptr)
     guint n_properties;
     GParamSpec** properties;
     GValue gval = {0,};
-    int i;
+    guint i;
 
     properties = g_object_class_list_properties(G_OBJECT_GET_CLASS(gobj), &n_properties);
 
@@ -292,7 +292,7 @@ gobj_new_body(struct param_setup_arg* arg)
 static VALUE
 gobj_new_ensure(struct param_setup_arg* arg)
 {
-    int i;
+    guint i;
     g_type_class_unref(arg->gclass);
     for (i = 0; i < arg->param_size; i++) {
         if (G_IS_VALUE(&arg->params[i].value))
@@ -396,7 +396,7 @@ gobj_s_properties(int argc, VALUE* argv, VALUE self)
     GParamSpec** props;
     VALUE inherited_too;
     VALUE ary;
-    int i;
+    guint i;
 
     if (rb_scan_args(argc, argv, "01", &inherited_too) == 0)
         inherited_too = Qtrue;

data/ext/glib2/rbgobj_param.c

@@ -376,7 +376,8 @@ Init_gobject_gparam_spec()
 
 /**********************************************************************/
 
-void Init_gobject_gparam()
+void
+Init_gobject_gparam()
 {
     Init_gobject_gparam_spec();
 }

data/ext/glib2/rbgobj_signal.c

@@ -79,8 +79,7 @@ gobj_s_signal_new(int argc, VALUE* argv, VALUE self)
     VALUE signal_name, signal_flags, accumulator, return_type, params;
     GClosure* class_closure;
     GType* param_types;
-    guint n_params;
-    int i;
+    long i, n_params;
     guint sig;
 
     rb_scan_args(argc, argv, "4*", &signal_name, &signal_flags,
@@ -287,7 +286,7 @@ gobj_sig_get_invocation_hint(VALUE self)
 }
 #endif
 
-struct emit_arg{
+struct emit_arg {
     VALUE self;
     VALUE args;
 
@@ -307,7 +306,7 @@ emit_body(struct emit_arg* arg)
     g_value_unset(&param);
 
     {
-        int i;
+        guint i;
         for (i = 0; i < arg->query.n_params; i++){
             GType gtype = arg->query.param_types[i] & ~G_SIGNAL_TYPE_STATIC_SCOPE;
 
@@ -370,7 +369,7 @@ gobj_sig_emit(int argc, VALUE *argv, VALUE self)
 
     g_signal_query(signal_id, &arg.query);
 
-    if (arg.query.n_params != RARRAY_LEN(arg.args))
+    if (arg.query.n_params != (guint)RARRAY_LEN(arg.args))
         rb_raise(rb_eArgError, "wrong number of arguments(%ld for %d)",
                  RARRAY_LEN(arg.args) + 1,
                  arg.query.n_params + 1);
@@ -484,7 +483,7 @@ chain_from_overridden_body(struct emit_arg* arg)
 
     {
         GValue* params = arg->instance_and_params->values + 1;
-        int i;
+        guint i;
         for (i = 0; i < arg->query.n_params; i++) {
             GType gtype = arg->query.param_types[i] & ~G_SIGNAL_TYPE_STATIC_SCOPE;
             g_value_init(params + i, gtype);
@@ -526,7 +525,7 @@ gobj_sig_chain_from_overridden(int argc, VALUE *argv, VALUE self)
         g_signal_query(hint->signal_id, &arg.query);
     }
 
-    if (arg.query.n_params != argc)
+    if (arg.query.n_params != (guint)argc)
         rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)",
                  argc, arg.query.n_params);
 
@@ -687,7 +686,7 @@ query_param_types(VALUE self)
 {
     GSignalQuery* query;
     VALUE result;
-    int i;
+    guint i;
     Data_Get_Struct(self, GSignalQuery, query);
 
     result = rb_ary_new2(query->n_params);
@@ -866,7 +865,7 @@ rbgobj_define_action_methods(VALUE klass)
     GString* source;
     guint n_ids;
     guint* ids;
-    int i;
+    guint i;
 
     if (gtype == G_TYPE_INTERFACE)
         return;
@@ -884,7 +883,7 @@ rbgobj_define_action_methods(VALUE klass)
             gchar* method_name = g_strdup(query.signal_name);
             gchar* p;
             GString* args;
-            int j;
+            guint j;
 
             for (p = method_name; *p; p++)
                 if (*p == '-')

data/ext/glib2/rbgobj_strv.c

@@ -14,48 +14,25 @@
 #if GLIB_CHECK_VERSION(2,6,0)
 
 static VALUE
-strv_to_ruby(const GValue* from)
+strv_to_ruby(const GValue *from)
 {
-    VALUE ary;
-    const gchar** boxed = (const gchar**)g_value_get_boxed(from);
-    if (!boxed)
-        return Qnil;
-  
-    ary = rb_ary_new();
-    while (*boxed){
-        rb_ary_push(ary, CSTR2RVAL(*boxed));
-        boxed++;
-    }
-    return ary;
+    return STRV2RVAL((const gchar **)g_value_get_boxed(from));
 }
 
 static void
-strv_from_ruby(VALUE from, GValue* to)
+strv_from_ruby(VALUE from, GValue *to)
 {
-    int i;
-    gchar** gstrv;
-
-    if (NIL_P(from)) {
-        g_value_set_boxed(to, NULL);
-        return;
-    }
-
-    Check_Type(from, T_ARRAY);
-    gstrv = g_new(gchar*, RARRAY_LEN(from) + 1);
-
-    for (i = 0; i < RARRAY_LEN(from); i++) {
-        VALUE v = RARRAY_PTR(from)[i];
-        gstrv[i] = g_strdup(StringValuePtr(v));
-    }
-    gstrv[RARRAY_LEN(from)] = NULL;
-
-    g_value_set_boxed(to, gstrv);
+    const gchar **strings = RVAL2STRV(from);
+    g_value_set_boxed(to, strings);
+    g_free(strings);
 }
 
-void Init_gobject_gstrv()
+void
+Init_gobject_gstrv()
 {
     /* GStrv is treated as Array */
     rbgobj_register_g2r_func(G_TYPE_STRV, strv_to_ruby);
     rbgobj_register_r2g_func(G_TYPE_STRV, strv_from_ruby);
 }
+
 #endif

data/ext/glib2/rbgobj_type.c

@@ -192,7 +192,7 @@ rbgobj_lookup_class_by_gtype_without_lock(GType gtype, VALUE parent,
     if (G_TYPE_IS_INSTANTIATABLE(gtype)){
         GType* interfaces = NULL;
         guint n_interfaces = 0;
-        int i;
+        guint i;
 
         interfaces = g_type_interfaces(gtype, &n_interfaces);
         for (i = 0; i < n_interfaces; i++){
@@ -663,7 +663,7 @@ type_children(VALUE self)
     guint n_children;
     GType* types;
     VALUE result;
-    int i;
+    guint i;
 
     types = g_type_children(rbgobj_gtype_get(self), &n_children);
     result = rb_ary_new2(n_children);
@@ -680,7 +680,7 @@ type_interfaces(VALUE self)
     guint n_interfaces;
     GType* types;
     VALUE result;
-    int i;
+    guint i;
 
     types = g_type_interfaces(rbgobj_gtype_get(self), &n_interfaces);
     result = rb_ary_new2(n_interfaces);
@@ -708,8 +708,8 @@ type_instance_size(VALUE self)
 }
 
 
-static inline
-void _def_fundamental_type(VALUE ary, GType gtype, const char* name)
+static inline void
+_def_fundamental_type(VALUE ary, GType gtype, const char* name)
 {
     VALUE c = rbgobj_gtype_new(gtype);
     rb_define_const(rbgobj_cType, name, c);
@@ -798,7 +798,8 @@ Init_type()
 
 /**********************************************************************/
 
-void Init_gobject_gtype()
+void
+Init_gobject_gtype()
 {
     g_type_init();
     Init_typemap();

data/ext/glib2/rbgobj_typeinterface.c

@@ -1,145 +1,145 @@
-/* -*- 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
-
-**********************************************************************/
-
-#include "rbgprivate.h"
-
-VALUE rbgobj_mInterface;
-VALUE mMetaInterface;
-
-static VALUE
+/* -*- 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
+
+**********************************************************************/
+
+#include "rbgprivate.h"
+
+VALUE rbgobj_mInterface;
+VALUE mMetaInterface;
+
+static VALUE
 interface_s_append_features(VALUE self, VALUE klass)
-{
-    if (!rb_obj_is_kind_of(klass, cInstantiatable))
-        rb_raise(rb_eTypeError, "Not a subclass of GLib::Instantiatable");
-    return rb_call_super(1, &klass);
-}
-
-#if GLIB_CHECK_VERSION(2,4,0)
-
-static VALUE
+{
+    if (!rb_obj_is_kind_of(klass, cInstantiatable))
+        rb_raise(rb_eTypeError, "Not a subclass of GLib::Instantiatable");
+    return rb_call_super(1, &klass);
+}
+
+#if GLIB_CHECK_VERSION(2,4,0)
+
+static VALUE
 interface_s_install_property(VALUE self, VALUE pspec_obj)
-{
-    const RGObjClassInfo* cinfo = rbgobj_lookup_class(self);
-    gpointer ginterface;
-    GParamSpec* pspec;
-
-    if (cinfo->klass != self)
-        rb_raise(rb_eTypeError, "%s isn't registered class", rb_class2name(self));
-
-    pspec = G_PARAM_SPEC(RVAL2GOBJ(pspec_obj));
-    ginterface = g_type_default_interface_ref(cinfo->gtype);
-    g_object_interface_install_property(ginterface, pspec);
-    g_type_default_interface_unref(ginterface);
-
-    /* FIXME: define accessor methods */
-    return Qnil;
-}
-
-static VALUE
+{
+    const RGObjClassInfo* cinfo = rbgobj_lookup_class(self);
+    gpointer ginterface;
+    GParamSpec* pspec;
+
+    if (cinfo->klass != self)
+        rb_raise(rb_eTypeError, "%s isn't registered class", rb_class2name(self));
+
+    pspec = G_PARAM_SPEC(RVAL2GOBJ(pspec_obj));
+    ginterface = g_type_default_interface_ref(cinfo->gtype);
+    g_object_interface_install_property(ginterface, pspec);
+    g_type_default_interface_unref(ginterface);
+
+    /* FIXME: define accessor methods */
+    return Qnil;
+}
+
+static VALUE
 interface_s_property(VALUE self, VALUE property_name)
-{
-    gpointer ginterface;
-    const char* name;
-    GParamSpec* prop;
-    VALUE result;
-    GType gtype = CLASS2GTYPE(self);
-
-    if (SYMBOL_P(property_name))
-        name = rb_id2name(SYM2ID(property_name));
-    else
-        name = StringValuePtr(property_name);
-
-    if (!G_TYPE_IS_INTERFACE(gtype))
-        rb_raise(rb_eTypeError, "%s isn't interface module", rb_class2name(self));
-    /* XXX: g_type_default_interface_ref(G_TYPE_INTERFACE) causes SEGV. */
-    if (gtype == G_TYPE_INTERFACE) {
-        rb_raise(rb_const_get(mGLib, rb_intern("NoPropertyError")),
-                 "No such property: %s", name);
-    }
-
-    ginterface = g_type_default_interface_ref(gtype);
-    prop = g_object_interface_find_property(ginterface, name);
-    if (!prop){
-        g_type_default_interface_unref(ginterface);
-        rb_raise(rb_const_get(mGLib, rb_intern("NoPropertyError")),
-                 "No such property: %s", name);
-    }
-    result = GOBJ2RVAL(prop);
-    g_type_default_interface_unref(ginterface);
-
-    return result;
-}
-
-static VALUE
-interface_s_properties(int argc, VALUE* argv, VALUE self)
-{
-    guint n_properties;
-    GParamSpec** props;
-    VALUE inherited_too;
-    VALUE ary = rb_ary_new();
-    int i;
-    gpointer ginterface;
-    GType gtype = CLASS2GTYPE(self);
-
-    if (rb_scan_args(argc, argv, "01", &inherited_too) == 0)
-        inherited_too = Qtrue;
-
-    if (!G_TYPE_IS_INTERFACE(gtype))
-        rb_raise(rb_eTypeError, "%s isn't interface module", rb_class2name(self));
-    /* XXX: g_type_default_interface_ref(G_TYPE_INTERFACE) causes SEGV. */
-    if (gtype == G_TYPE_INTERFACE) return ary;
-
-    ginterface = g_type_default_interface_ref(gtype);
-    props = g_object_interface_list_properties(ginterface, &n_properties);
-    for (i = 0; i < n_properties; i++){
-        if (RVAL2CBOOL(inherited_too) || GTYPE2CLASS(props[i]->owner_type) == self)
-            rb_ary_push(ary, rb_str_new2(props[i]->name));
-    }
-    g_free(props);
-    g_type_default_interface_unref(ginterface);
-
-    return ary;
-}
-
-#endif
-
-void
-rbgobj_init_interface(VALUE interf)
-{
-    static VALUE rb_mGLibInterface = Qnil;
-
-    rb_extend_object(interf, mMetaInterface);
-    if (CLASS2GTYPE(interf) == G_TYPE_INTERFACE) {
-	rb_mGLibInterface = interf;
-    } else {
-        rb_extend_object(interf, rb_mGLibInterface);
-        rb_include_module(interf, rb_mGLibInterface);
-        rbgobj_define_property_accessors(interf);
-    }
-}
-
-void
-Init_gobject_typeinterface()
-{
-    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);
-#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);
-#endif
-
-    rbgobj_mInterface = G_DEF_INTERFACE(G_TYPE_INTERFACE, "Interface", mGLib);
-}
+{
+    gpointer ginterface;
+    const char* name;
+    GParamSpec* prop;
+    VALUE result;
+    GType gtype = CLASS2GTYPE(self);
+
+    if (SYMBOL_P(property_name))
+        name = rb_id2name(SYM2ID(property_name));
+    else
+        name = StringValuePtr(property_name);
+
+    if (!G_TYPE_IS_INTERFACE(gtype))
+        rb_raise(rb_eTypeError, "%s isn't interface module", rb_class2name(self));
+    /* XXX: g_type_default_interface_ref(G_TYPE_INTERFACE) causes SEGV. */
+    if (gtype == G_TYPE_INTERFACE) {
+        rb_raise(rb_const_get(mGLib, rb_intern("NoPropertyError")),
+                 "No such property: %s", name);
+    }
+
+    ginterface = g_type_default_interface_ref(gtype);
+    prop = g_object_interface_find_property(ginterface, name);
+    if (!prop){
+        g_type_default_interface_unref(ginterface);
+        rb_raise(rb_const_get(mGLib, rb_intern("NoPropertyError")),
+                 "No such property: %s", name);
+    }
+    result = GOBJ2RVAL(prop);
+    g_type_default_interface_unref(ginterface);
+
+    return result;
+}
+
+static VALUE
+interface_s_properties(int argc, VALUE* argv, VALUE self)
+{
+    guint n_properties;
+    GParamSpec** props;
+    VALUE inherited_too;
+    VALUE ary = rb_ary_new();
+    guint i;
+    gpointer ginterface;
+    GType gtype = CLASS2GTYPE(self);
+
+    if (rb_scan_args(argc, argv, "01", &inherited_too) == 0)
+        inherited_too = Qtrue;
+
+    if (!G_TYPE_IS_INTERFACE(gtype))
+        rb_raise(rb_eTypeError, "%s isn't interface module", rb_class2name(self));
+    /* XXX: g_type_default_interface_ref(G_TYPE_INTERFACE) causes SEGV. */
+    if (gtype == G_TYPE_INTERFACE) return ary;
+
+    ginterface = g_type_default_interface_ref(gtype);
+    props = g_object_interface_list_properties(ginterface, &n_properties);
+    for (i = 0; i < n_properties; i++){
+        if (RVAL2CBOOL(inherited_too) || GTYPE2CLASS(props[i]->owner_type) == self)
+            rb_ary_push(ary, rb_str_new2(props[i]->name));
+    }
+    g_free(props);
+    g_type_default_interface_unref(ginterface);
+
+    return ary;
+}
+
+#endif
+
+void
+rbgobj_init_interface(VALUE interf)
+{
+    static VALUE rb_mGLibInterface = Qnil;
+
+    rb_extend_object(interf, mMetaInterface);
+    if (CLASS2GTYPE(interf) == G_TYPE_INTERFACE) {
+	rb_mGLibInterface = interf;
+    } else {
+        rb_extend_object(interf, rb_mGLibInterface);
+        rb_include_module(interf, rb_mGLibInterface);
+        rbgobj_define_property_accessors(interf);
+    }
+}
+
+void
+Init_gobject_typeinterface()
+{
+    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);
+#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);
+#endif
+
+    rbgobj_mInterface = G_DEF_INTERFACE(G_TYPE_INTERFACE, "Interface", mGLib);
+}