gio2 1.0.3 → 1.1.0

data/ext/gio2/{gbufferedinputstream.c → rbgiobufferedinputstream.c}

@@ -1,29 +1,31 @@
-/* -*- c-file-style: "ruby" -*- */
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Ruby/GIO: a Ruby binding of gio-2.0.x.
- * Copyright (C) 2008-2009  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-2009  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.
+ *  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.
+ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  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 "gio2.h"
+#include "rbgio2private.h"
 
-#define _SELF(value) G_BUFFERED_INPUT_STREAM(RVAL2GOBJ(value))
+#define RG_TARGET_NAMESPACE cBufferedInputStream
+#define _SELF(value) RVAL2GBUFFEREDINPUTSTREAM(value)
 
 static VALUE
-bufferedinputstream_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
         VALUE rbbase_stream, size;
         GInputStream *base_stream, *stream;
@@ -40,13 +42,13 @@ bufferedinputstream_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-bufferedinputstream_get_available(VALUE self)
+rg_available(VALUE self)
 {
         return GSIZE2RVAL(g_buffered_input_stream_get_available(_SELF(self)));
 }
 
 static VALUE
-bufferedinputstream_peek_buffer(VALUE self)
+rg_peek_buffer(VALUE self)
 {
         gsize size;
         const void *buffer;
@@ -57,7 +59,7 @@ bufferedinputstream_peek_buffer(VALUE self)
 }
 
 static VALUE
-bufferedinputstream_peek(VALUE self, VALUE rboffset, VALUE rbcount)
+rg_peek(VALUE self, VALUE rboffset, VALUE rbcount)
 {
         gsize offset = RVAL2GSIZE(rboffset);
         gsize count = RVAL2GSIZE(rbcount);
@@ -75,7 +77,7 @@ bufferedinputstream_peek(VALUE self, VALUE rboffset, VALUE rbcount)
 }
 
 static VALUE
-bufferedinputstream_fill(int argc, VALUE *argv, VALUE self)
+rg_fill(int argc, VALUE *argv, VALUE self)
 {
         VALUE count, cancellable;
         GError *error = NULL;
@@ -95,7 +97,7 @@ bufferedinputstream_fill(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-bufferedinputstream_fill_async(int argc, VALUE *argv, VALUE self)
+rg_fill_async(int argc, VALUE *argv, VALUE self)
 {
         VALUE rbcount, rbio_priority, rbcancellable, block;
         gssize count;
@@ -118,7 +120,7 @@ bufferedinputstream_fill_async(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-bufferedinputstream_fill_finish(VALUE self, VALUE result)
+rg_fill_finish(VALUE self, VALUE result)
 {
         GError *error = NULL;
         gsize bytes_read;
@@ -133,7 +135,7 @@ bufferedinputstream_fill_finish(VALUE self, VALUE result)
 }
 
 static VALUE
-bufferedinputstream_read_byte(int argc, VALUE *argv, VALUE self)
+rg_read_byte(int argc, VALUE *argv, VALUE self)
 {
         VALUE cancellable;
         GError *error = NULL;
@@ -150,16 +152,16 @@ bufferedinputstream_read_byte(int argc, VALUE *argv, VALUE self)
 }
 
 void
-Init_gbufferedinputstream(VALUE glib)
+Init_gbufferedinputstream(VALUE mGio)
 {
-        VALUE bufferedinputstream = G_DEF_CLASS(G_TYPE_BUFFERED_INPUT_STREAM, "BufferedInputStream", glib);
-
-        rb_define_method(bufferedinputstream, "initialize", bufferedinputstream_initialize, -1);
-        rb_define_method(bufferedinputstream, "available", bufferedinputstream_get_available, 0);
-        rb_define_method(bufferedinputstream, "peek_buffer", bufferedinputstream_peek_buffer, 0);
-        rb_define_method(bufferedinputstream, "peek", bufferedinputstream_peek, 2);
-        rb_define_method(bufferedinputstream, "fill", bufferedinputstream_fill, -1);
-        rb_define_method(bufferedinputstream, "fill_async", bufferedinputstream_fill_async, -1);
-        rb_define_method(bufferedinputstream, "fill_finish", bufferedinputstream_fill_finish, 1);
-        rb_define_method(bufferedinputstream, "read_byte", bufferedinputstream_read_byte, -1);
+        VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_BUFFERED_INPUT_STREAM, "BufferedInputStream", mGio);
+
+        RG_DEF_METHOD(initialize, -1);
+        RG_DEF_METHOD(available, 0);
+        RG_DEF_METHOD(peek_buffer, 0);
+        RG_DEF_METHOD(peek, 2);
+        RG_DEF_METHOD(fill, -1);
+        RG_DEF_METHOD(fill_async, -1);
+        RG_DEF_METHOD(fill_finish, 1);
+        RG_DEF_METHOD(read_byte, -1);
 }

data/ext/gio2/rbgiobufferedoutputstream.c

@@ -0,0 +1,50 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-2009  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
+ */
+
+#include "rbgio2private.h"
+
+#define RG_TARGET_NAMESPACE cBufferedOutputStream
+#define _SELF(value) RVAL2GBUFFEREDOUTPUTSTREAM(value)
+
+static VALUE
+rg_initialize(int argc, VALUE *argv, VALUE self)
+{
+        VALUE rbbase_stream, size;
+        GOutputStream *base_stream, *stream;
+
+        rb_scan_args(argc, argv, "11", &rbbase_stream, &size);
+        base_stream = RVAL2GOUTPUTSTREAM(rbbase_stream);
+
+        stream = NIL_P(size) ?
+                g_buffered_output_stream_new(base_stream) :
+                g_buffered_output_stream_new_sized(base_stream, RVAL2GSIZE(size));
+        G_INITIALIZE(self, stream);
+
+        return Qnil;
+}
+
+void
+Init_gbufferedoutputstream(VALUE mGio)
+{
+        VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_BUFFERED_OUTPUT_STREAM, "BufferedOutputStream", mGio);
+
+        RG_DEF_METHOD(initialize, -1);
+}

data/ext/gio2/rbgiocancellable.c

@@ -0,0 +1,180 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-2009  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
+ */
+
+#include "rbgio2private.h"
+
+#define RG_TARGET_NAMESPACE cCancellable
+#define _SELF(value) RVAL2GCANCELLABLE(value)
+
+static VALUE
+rg_initialize(VALUE self)
+{
+        G_INITIALIZE(self, g_cancellable_new());
+
+        return Qnil;
+}
+
+static VALUE
+rg_cancelled_p(VALUE self)
+{
+        return CBOOL2RVAL(g_cancellable_is_cancelled(_SELF(self)));
+}
+
+static VALUE
+rg_raise_error_if_cancelled(VALUE self)
+{
+        GError *error = NULL;
+
+        if (g_cancellable_set_error_if_cancelled(_SELF(self), &error))
+                rbgio_raise_error(error);
+
+        return self;
+}
+
+static VALUE
+rg_fd(VALUE self)
+{
+        return FD2RVAL(g_cancellable_get_fd(_SELF(self)));
+}
+
+static VALUE
+rg_make_pollfd(VALUE self)
+{
+        GCancellable *cancellable = _SELF(self);
+        GPollFD *gfd = g_new(GPollFD, 1);
+
+        g_cancellable_make_pollfd(cancellable, gfd);
+
+        return GPOLLFD2RVAL(gfd);
+}
+
+G_GNUC_NORETURN static VALUE
+rg_release_fd(VALUE self)
+{
+        /* TODO: How do we implement this?  Maybe not at all? */
+        self = self;
+        rb_raise(rb_eNotImpError, "release_fd has not been implemented yet");
+#if 0
+        g_cancellable_release_fd(_SELF(self));
+
+        return self;
+#endif
+}
+
+static VALUE
+rg_s_current(G_GNUC_UNUSED VALUE self)
+{
+        return GOBJ2RVAL(g_cancellable_get_current());
+}
+
+static VALUE
+rg_pop_current(VALUE self)
+{
+        g_cancellable_pop_current(_SELF(self));
+
+        return self;
+}
+
+static VALUE
+rg_push_current(VALUE self)
+{
+        g_cancellable_push_current(_SELF(self));
+
+        return self;
+}
+
+static VALUE
+rg_reset(VALUE self)
+{
+        g_cancellable_reset(_SELF(self));
+
+        return self;
+}
+
+static VALUE
+cancellable_connect_callback_call(VALUE block)
+{
+        static ID s_id_call;
+
+        if (s_id_call == 0)
+                s_id_call = rb_intern("call");
+
+        rb_funcall(block, s_id_call, 0);
+
+        return Qnil;
+}
+
+static void
+cancellable_connect_callback(gpointer block)
+{
+        G_PROTECT_CALLBACK(cancellable_connect_callback_call, block);
+}
+
+static VALUE
+rg_connect(VALUE self)
+{
+        VALUE block;
+
+        block = rb_block_proc();
+        G_RELATIVE(self, block);
+
+        return GULONG2RVAL(g_cancellable_connect(_SELF(self),
+                                                 G_CALLBACK(cancellable_connect_callback),
+                                                 (gpointer)block,
+                                                 NULL));
+}
+
+static VALUE
+rg_disconnect(VALUE self, VALUE handler_id)
+{
+        g_cancellable_disconnect(_SELF(self), RVAL2GULONG(handler_id));
+
+        return self;
+}
+
+static VALUE
+rg_cancel(VALUE self)
+{
+        g_cancellable_cancel(_SELF(self));
+
+        return self;
+}
+
+void
+Init_gcancellable(VALUE mGio)
+{
+        VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_CANCELLABLE, "Cancellable", mGio);
+
+        RG_DEF_SMETHOD(current, 0);
+
+        RG_DEF_METHOD(initialize, 0);
+        RG_DEF_METHOD_P(cancelled, 0);
+        RG_DEF_METHOD(raise_error_if_cancelled, 0);
+        RG_DEF_METHOD(fd, 0);
+        RG_DEF_METHOD(make_pollfd, 0);
+        RG_DEF_METHOD(release_fd, 0);
+        RG_DEF_METHOD(pop_current, 0);
+        RG_DEF_METHOD(push_current, 0);
+        RG_DEF_METHOD(reset, 0);
+        RG_DEF_METHOD(connect, 0);
+        RG_DEF_METHOD(disconnect, 1);
+        RG_DEF_METHOD(cancel, 0);
+}

data/ext/gio2/rbgiocharsetconverter.c

@@ -0,0 +1,57 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-2009  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
+ */
+
+#include "rbgio2private.h"
+
+#define RG_TARGET_NAMESPACE cCharsetConverter
+#define _SELF(value) RVAL2GCHARSETCONVERTER(value)
+
+static VALUE
+rg_initialize(VALUE self, VALUE to, VALUE from)
+{
+        GError *error = NULL;
+        GCharsetConverter *converter;
+
+        converter = g_charset_converter_new(RVAL2CSTR(to),
+                                            RVAL2CSTR(from),
+                                            &error);
+        if (converter == NULL)
+                rbgio_raise_error(error);
+
+        G_INITIALIZE(self, converter);
+
+        return Qnil;
+}
+
+static VALUE
+rg_num_fallbacks(VALUE self)
+{
+        return GUINT2RVAL(g_charset_converter_get_num_fallbacks(_SELF(self)));
+}
+
+void
+Init_gcharsetconverter(VALUE mGio)
+{
+        VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_CHARSET_CONVERTER, "CharsetConverter", mGio);
+
+        RG_DEF_METHOD(initialize, 2);
+        RG_DEF_METHOD(num_fallbacks, 0);
+}

data/ext/gio2/rbgiocontenttype.c

@@ -0,0 +1,131 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-2009  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
+ */
+
+#include "rbgio2private.h"
+
+#define RG_TARGET_NAMESPACE mContentType
+
+static VALUE
+rg_m_equals_p(G_GNUC_UNUSED VALUE self, VALUE arg1, VALUE arg2)
+{
+        return CBOOL2RVAL(g_content_type_equals(RVAL2CSTR(arg1), RVAL2CSTR(arg2)));
+}
+
+static VALUE
+rg_m_is_a_p(G_GNUC_UNUSED VALUE self, VALUE arg1, VALUE arg2)
+{
+        return CBOOL2RVAL(g_content_type_is_a(RVAL2CSTR(arg1), RVAL2CSTR(arg2)));
+}
+
+static VALUE
+rg_m_unknown_p(G_GNUC_UNUSED VALUE type)
+{
+        return CBOOL2RVAL(g_content_type_is_unknown(RVAL2CSTR(type)));
+}
+
+static VALUE
+rg_m_get_description(G_GNUC_UNUSED VALUE type)
+{
+        return CSTR2RVAL_FREE(g_content_type_get_description(RVAL2CSTR(type)));
+}
+
+static VALUE
+rg_m_get_mime_type(G_GNUC_UNUSED VALUE type)
+{
+        return CSTR2RVAL_FREE(g_content_type_get_mime_type(RVAL2CSTR(type)));
+}
+
+static VALUE
+rg_m_get_icon(G_GNUC_UNUSED VALUE type)
+{
+        return GOBJ2RVAL_UNREF(g_content_type_get_icon(RVAL2CSTR(type)));
+}
+
+static VALUE
+rg_m_can_be_executable_p(G_GNUC_UNUSED VALUE type)
+{
+        return CBOOL2RVAL(g_content_type_can_be_executable(RVAL2CSTR(type)));
+}
+
+static VALUE
+rg_m_from_mime_type(G_GNUC_UNUSED VALUE type)
+{
+        return CSTR2RVAL(g_content_type_from_mime_type(RVAL2CSTR(type)));
+}
+
+static VALUE
+rg_m_guess(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+{
+        VALUE rbfilename,
+              rbdata;
+        const char *filename;
+        const guchar *data;
+        gboolean result_uncertain;
+        char *type;
+
+        rb_scan_args(argc, argv, "02", &rbfilename, &rbdata);
+
+        if (NIL_P(rbfilename) && NIL_P(rbdata))
+                rb_raise(rb_eArgError,
+                         "Either filename or data can be nil but not both");
+
+        filename = RVAL2CSTR_ACCEPT_NIL(rbfilename);
+        data = (guchar *)RVAL2CSTR_ACCEPT_NIL(rbdata);
+
+        type = g_content_type_guess(filename,
+                                    data,
+                                    (gsize)((data != NULL) ? RSTRING_LEN(rbdata) : 0),
+                                    &result_uncertain);
+
+        return rb_assoc_new(CSTR2RVAL_FREE(type), CBOOL2RVAL(result_uncertain));
+}
+
+static VALUE
+rg_m_guess_for_tree(G_GNUC_UNUSED VALUE self, VALUE root)
+{
+        return STRV2RVAL_FREE(g_content_type_guess_for_tree(RVAL2GFILE(root)));
+}
+
+static VALUE
+rg_m_registered(G_GNUC_UNUSED VALUE self)
+{
+        return GLIST2ARY_STR_FREE(g_content_types_get_registered());
+}
+
+void
+Init_gcontenttype(VALUE mGio)
+{
+        VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGio, "ContentType");
+
+        /* TODO: Should wrap this in a class. */
+        RG_DEF_MODFUNC_P(equals, 2);
+        /* TODO: This name isn't great. */
+        RG_DEF_MODFUNC_P(is_a, 2);
+        RG_DEF_MODFUNC_P(unknown, 1);
+        RG_DEF_MODFUNC(get_description, 1);
+        RG_DEF_MODFUNC(get_mime_type, 1);
+        RG_DEF_MODFUNC(get_icon, 1);
+        RG_DEF_MODFUNC_P(can_be_executable, 1);
+        RG_DEF_MODFUNC(from_mime_type, 1);
+        RG_DEF_MODFUNC(guess, -1);
+        RG_DEF_MODFUNC(guess_for_tree, 1);
+        RG_DEF_MODFUNC(registered, 0);
+}

data/ext/gio2/{gconverter.c → rbgioconverter.c}

@@ -1,42 +1,38 @@
-/* -*- c-file-style: "ruby" -*- */
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Ruby/GIO: a Ruby binding of gio-2.0.x.
- * Copyright (C) 2008-2009  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-2009  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.
+ *  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.
+ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  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 "gio2.h"
+#include "rbgio2private.h"
 
-#define _SELF(value) G_CONVERTER(RVAL2GOBJ(value))
-
-#define RVAL2GCONVERTERFLAGS(value) \
-        RVAL2GFLAGS((value), G_TYPE_CONVERTER_FLAGS)
+#define RG_TARGET_NAMESPACE mConverter
+#define _SELF(value) RVAL2GCONVERTER(value)
 
 #define RVAL2GCONVERTERFLAGSDEFAULT(value) \
         RVAL2TYPE_WITH_DEFAULT((value), \
                                RVAL2GCONVERTERFLAGS, \
                                G_CONVERTER_NO_FLAGS)
 
-#define GCONVERTERRESULT2RVAL(value) \
-        GFLAGS2RVAL((value), G_TYPE_CONVERTER_RESULT)
-
 /* TODO: Look at gconverteroutputstream for implementing this. */
 /* TODO: Actually, is there any point in implementing this? */
 static VALUE
-converter_convert(int argc, VALUE *argv, VALUE self)
+rg_convert(int argc, VALUE *argv, VALUE self)
 {
         VALUE input, rbflags;
         GConverter *converter;
@@ -100,7 +96,7 @@ converter_convert(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-converter_reset(VALUE self)
+rg_reset(VALUE self)
 {
         g_converter_reset(_SELF(self));
 
@@ -108,10 +104,10 @@ converter_reset(VALUE self)
 }
 
 void
-Init_gconverter(VALUE glib)
+Init_gconverter(VALUE mGio)
 {
-        VALUE converter = G_DEF_INTERFACE(G_TYPE_CONVERTER, "Converter", glib);
+        VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(G_TYPE_CONVERTER, "Converter", mGio);
 
-        rb_define_method(converter, "convert", converter_convert, -1);
-        rb_define_method(converter, "reset", converter_reset, 0);
+        RG_DEF_METHOD(convert, -1);
+        RG_DEF_METHOD(reset, 0);
 }

data/ext/gio2/rbgioconverterinputstream.c

@@ -0,0 +1,43 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008-2009  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
+ */
+
+#include "rbgio2private.h"
+
+#define RG_TARGET_NAMESPACE cConverterInputStream
+#define _SELF(value) RVAL2GCONVERTERINPUTSTREAM(value)
+
+static VALUE
+rg_initialize(VALUE self, VALUE base_stream, VALUE converter)
+{
+        G_INITIALIZE(self,
+                     g_converter_input_stream_new(RVAL2GINPUTSTREAM(base_stream),
+                                                  RVAL2GCONVERTER(converter)));
+
+        return Qnil;
+}
+
+void
+Init_gconverterinputstream(VALUE mGio)
+{
+        VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_CONVERTER_INPUT_STREAM, "ConverterInputStream", mGio);
+
+        RG_DEF_METHOD(initialize, 2);
+}