glib2 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/glib2/rbglib.h

@@ -1,19 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbglib.h -
-
-  $Author: sakai $
-  $Date: 2007/07/04 13:13:20 $
-
-  Copyright (C) 2002-2005  Ruby-GNOME2 Project
-  Copyright (C) 2002,2003  Masahiro Sakai
-
-**********************************************************************/
+/*
+ *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005  Ruby-GNOME2 Project
+ *  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 <glib.h>
 #include "ruby.h"
 
+#include "rbglibdeprecated.h"
+#include "rbglib2conversions.h"
+
 #ifndef __RBGLIB_H__
 #define __RBGLIB_H__
 
@@ -22,8 +34,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define RBGLIB_MAJOR_VERSION 1
-#define RBGLIB_MINOR_VERSION 0
-#define RBGLIB_MICRO_VERSION 3
+#define RBGLIB_MINOR_VERSION 1
+#define RBGLIB_MICRO_VERSION 0
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -45,29 +57,56 @@ typedef int GPid;
 
 #define RBG_INSPECT(object) (rbg_rval_inspect(object))
 
-#define RVAL2CSTR(v) (rbg_rval2cstr(&v))
-#define RVAL2CSTR_ACCEPT_NIL(v) (rbg_rval2cstr_accept_nil(&v))
+#define RVAL2CSTR(v) (rbg_rval2cstr(&(v)))
+#define RVAL2CSTR_ACCEPT_NIL(v) (rbg_rval2cstr_accept_nil(&(v)))
 #define RVAL2CSTR2(v) (RVAL2CSTR_ACCEPT_NIL(v))
+#define RVAL2CSTR_ACCEPT_SYMBOL(v) (rbg_rval2cstr_accept_symbol(&(v)))
+#define RVAL2CSTR_ACCEPT_SYMBOL_ACCEPT_NIL(v) (rbg_rval2cstr_accept_symbol_accept_nil(&(v)))
+#define RVAL2GLIBID(v, buf) (rbg_rval2glibid(&(v), &(buf), FALSE))
+#define RVAL2GLIBID_ACCEPT_NIL(v, buf) (rbg_rval2glibid(&(v), &(buf), TRUE))
 #define CSTR2RVAL(s) (rbg_cstr2rval(s))
 #define CSTR2RVAL_LEN(s, l) (rbg_cstr2rval_len(s, l))
+#define CSTR2RVAL_LEN_FREE(s, l) (rbg_cstr2rval_len_free(s, l))
 #define CSTR2RVAL_ENC(s, e) (rbg_cstr2rval_with_encoding(s, e))
 #define CSTR2RVAL_LEN_ENC(s, l, e) (rbg_cstr2rval_len_with_encoding(s, l, e))
 #define CSTR2RVAL_FREE(s) (rbg_cstr2rval_free(s))
 #define CSTR2RVAL2(s) (CSTR2RVAL_FREE(s))
 
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+#  define CSTR2RVAL_LEN_UCS4(s, l) (CSTR2RVAL_LEN_ENC(s, l, "UTF-32LE"))
+#  define CSTR2RVAL_LEN_UTF16(s, l) (CSTR2RVAL_LEN_ENC(s, l, "UTF-16LE"))
+#else
+#  define CSTR2RVAL_LEN_UCS4(s, l) (CSTR2RVAL_LEN_ENC(s, l, "UTF-32BE"))
+#  define CSTR2RVAL_LEN_UTF16(s, l) (CSTR2RVAL_LEN_ENC(s, l, "UTF-16BE"))
+#endif
+
 #define RVAL2CSTRFILENAME(v) (rbg_filename_from_ruby(v))
 #define CSTRFILENAME2RVAL(s) (rbg_filename_to_ruby(s))
 #define CSTRFILENAME2RVAL_FREE(s) (rbg_filename_to_ruby_free(s))
-#define CSTRFILENAMEARRAY2RVAL_FREE(s) (rbg_filename_gslist_to_array_free(s))
 
-#define RVAL2STRV(ary) rbg_rval2strv(ary)
-#define RVAL2STRV_ACCEPT_NIL(ary) rbg_rval2strv_accept_nil(ary)
-#define RVAL2STRV_DUP(ary) rbg_rval2strv_dup(ary)
-#define RVAL2STRV_DUP_ACCEPT_NIL(ary) rbg_rval2strv_dup_accept_nil(ary)
+#define RVAL2STRS(ary, n) rbg_rval2strv(&(ary), &(n))
+#define RVAL2STRS_ACCEPT_NIL(ary, n) rbg_rval2strv_accept_nil(&(ary), &(n))
+#define RVAL2STRV(ary) rbg_rval2strv(&(ary), NULL)
+#define RVAL2STRV_ACCEPT_NIL(ary) rbg_rval2strv_accept_nil(&(ary), NULL)
+#define RVAL2STRS_DUP(ary, n) rbg_rval2strv_dup(&(ary), &(n))
+#define RVAL2STRS_DUP_ACCEPT_NIL(ary, n) rbg_rval2strv_dup_accept_nil(&(ary), &(n))
+#define RVAL2STRV_DUP(ary) rbg_rval2strv_dup(&(ary), NULL)
+#define RVAL2STRV_DUP_ACCEPT_NIL(ary) rbg_rval2strv_dup_accept_nil(&(ary), NULL)
 
 #define STRV2RVAL(strings) rbg_strv2rval(strings)
 #define STRV2RVAL_FREE(strings) rbg_strv2rval_free(strings)
 
+#define RVAL2GBOOLEANS(ary, n) rbg_rval2gbooleans(&(ary), &(n))
+#define RVAL2GINTS(ary, n) rbg_rval2gints(&(ary), &(n))
+#define RVAL2GINT8S(ary, n) rbg_rval2gint8s(&(ary), &(n))
+#define RVAL2GUINT8S(ary, n) rbg_rval2guint8s(&(ary), &(n))
+#define RVAL2GUINT16S(ary, n) rbg_rval2guint16s(&(ary), &(n))
+#define RVAL2GUINT32S(ary, n) rbg_rval2guint32s(&(ary), &(n))
+#define RVAL2GDOUBLES(ary, n) rbg_rval2gdoubles(&(ary), &(n))
+
+#define GINTS2RVAL(ary, n) rbg_gints2rval(ary, n)
+#define GINTS2RVAL_FREE(ary, n) rbg_gints2rval(ary, n)
+
 #define CBOOL2RVAL(b)   ((b) ? Qtrue : Qfalse)
 #define RVAL2CBOOL(b)   (RTEST(b))
 #define GERROR2RVAL(error) (rbgerr_gerror2exception(error))
@@ -94,8 +133,13 @@ extern const gchar *rbg_rval_inspect(VALUE object);
 extern gchar* rbg_string_value_ptr(volatile VALUE* ptr); /* no longer used */
 extern const gchar *rbg_rval2cstr(VALUE *str);
 extern const gchar *rbg_rval2cstr_accept_nil(VALUE *str);
+extern const gchar *rbg_rval2cstr_accept_symbol(volatile VALUE *value);
+extern const gchar *rbg_rval2cstr_accept_symbol_accept_nil(volatile VALUE *value);
+extern const gchar *rbg_rval2glibid(volatile VALUE *value, volatile VALUE *buf, gboolean accept_nil);
+
 extern VALUE rbg_cstr2rval(const gchar* str);
 extern VALUE rbg_cstr2rval_len(const gchar* str, gsize len);
+extern VALUE rbg_cstr2rval_len_free(gchar *str, gsize len);
 extern VALUE rbg_cstr2rval_with_encoding(const gchar* str,
                                          const gchar *encoding);
 extern VALUE rbg_cstr2rval_len_with_encoding(const gchar* str, gsize len,
@@ -107,16 +151,27 @@ extern VALUE rbg_cstr2rval_with_free(gchar *str);
 VALUE rbg_filename_to_ruby(const gchar *filename);
 extern VALUE rbg_filename_to_ruby_free(gchar *filename);
 extern gchar *rbg_filename_from_ruby(VALUE filename);
-extern VALUE rbg_filename_gslist_to_array_free(GSList *list);
 
-const gchar **rbg_rval2strv(VALUE ary);
-const gchar **rbg_rval2strv_accept_nil(VALUE ary);
-gchar **rbg_rval2strv_dup(VALUE ary);
-gchar **rbg_rval2strv_dup_accept_nil(VALUE ary);
-const gchar **rbg_rval2argv(VALUE ary);
+const gchar **rbg_rval2strv(volatile VALUE *value, long *n);
+const gchar **rbg_rval2strv_accept_nil(volatile VALUE *value, long *n);
+gchar **rbg_rval2strv_dup(volatile VALUE *value, long *n);
+gchar **rbg_rval2strv_dup_accept_nil(volatile VALUE *value, long *n);
 VALUE rbg_strv2rval(const gchar **strings);
 VALUE rbg_strv2rval_free(gchar **strings);
 
+gboolean *rbg_rval2gbooleans(volatile VALUE *value, long *n);
+gint *rbg_rval2gints(volatile VALUE *value, long *n);
+gint8 *rbg_rval2gint8s(volatile VALUE *value, long *n);
+guint8 *rbg_rval2guint8s(volatile VALUE *value, long *n);
+guint16 *rbg_rval2guint16s(volatile VALUE *value, long *n);
+guint32 *rbg_rval2guint32s(volatile VALUE *value, long *n);
+gdouble *rbg_rval2gdoubles(volatile VALUE *value, long *n);
+
+VALUE rbg_gints2rval(const gint *gints, long n);
+VALUE rbg_gints2rval_free(gint *gints, long n);
+
+extern void rbg_scan_options(VALUE options, ...);
+
 /* rbgerror.h */
 extern VALUE rbgerr_gerror2exception(GError *error);
 extern VALUE rbgerr_define_gerror(GQuark domain, const gchar* name, VALUE module, VALUE parent, VALUE gtype);

data/ext/glib2/rbglib2conversions.h

@@ -0,0 +1,57 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  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 __GLIB2CONVERSIONS_H__
+#define __GLIB2CONVERSIONS_H__
+
+#define RVAL2GPARAMSPEC(o)                 (G_PARAM_SPEC(RVAL2GOBJ(o)))
+
+#define RVAL2GCLOSURE(o)                   ((GClosure*)RVAL2BOXED(o, G_TYPE_CLOSURE))
+#define GCLOSURE2RVAL(o)                   (BOXED2RVAL(o, G_TYPE_CLOSURE))
+#define RVAL2GCOMPLETION(o)                ((GCompletion*)RVAL2BOXED(o, G_TYPE_COMPLETION))
+#define GCOMPLETION2RVAL(o)                (BOXED2RVAL(o, G_TYPE_COMPLETION))
+#define RVAL2GIOCHANNEL(o)                 ((GIOChannel*)RVAL2BOXED(o, G_TYPE_IO_CHANNEL))
+#define GIOCHANNEL2RVAL(o)                 (BOXED2RVAL(o, G_TYPE_IO_CHANNEL))
+#define RVAL2GKEYFILE(o)                   ((GKeyFile*)RVAL2BOXED(o, G_TYPE_KEY_FILE))
+#define GKEYFILE2RVAL(o)                   (BOXED2RVAL(o, G_TYPE_KEY_FILE))
+#define RVAL2GMAINCONTEXT(o)               ((GMainContext*)RVAL2BOXED(o, G_TYPE_MAIN_CONTEXT))
+#define GMAINCONTEXT2RVAL(o)               (BOXED2RVAL(o, G_TYPE_MAIN_CONTEXT))
+#define RVAL2GMAINLOOP(o)                  ((GMainLoop*)RVAL2BOXED(o, G_TYPE_MAIN_LOOP))
+#define GMAINLOOP2RVAL(o)                  (BOXED2RVAL(o, G_TYPE_MAIN_LOOP))
+#define RVAL2GPOLLFD(o)                    ((GPollFD*)RVAL2BOXED(o, G_TYPE_POLL_FD))
+#define GPOLLFD2RVAL(o)                    (BOXED2RVAL(o, G_TYPE_POLL_FD))
+#define RVAL2GSOURCE(o)                    ((GSource*)RVAL2BOXED(o, G_TYPE_SOURCE))
+#define GSOURCE2RVAL(o)                    (BOXED2RVAL(o, G_TYPE_SOURCE))
+#define RVAL2GTIMER(o)                     ((GTimer*)RVAL2BOXED(o, G_TYPE_TIMER))
+#define GTIMER2RVAL(o)                     (BOXED2RVAL(o, G_TYPE_TIMER))
+#define RVAL2GVALUE(o)                     ((GValue*)RVAL2BOXED(o, G_TYPE_VALUE))
+#define GVALUE2RVAL(o)                     (BOXED2RVAL(o, G_TYPE_VALUE))
+
+#define RVAL2GIOCONDITION(o)               (RVAL2GENUM(o, G_TYPE_IO_CONDITION))
+#define GIOCONDITION2RVAL(o)               (GENUM2RVAL(o, G_TYPE_IO_CONDITION))
+#define RVAL2GNORMALIZEMODE(o)             (RVAL2GENUM(o, G_TYPE_NORMALIZE_MODE))
+#define GNORMALIZEMODE2RVAL(o)             (GENUM2RVAL(o, G_TYPE_NORMALIZE_MODE))
+
+#define RVAL2GCONNECTFLAGS(o)              (RVAL2GFLAGS(o, G_TYPE_CONNECT_FLAGS))
+#define GCONNECTFLAGS2RVAL(o)              (GFLAGS2RVAL(o, G_TYPE_CONNECT_FLAGS))
+#define RVAL2GKEYFILEFLAGS(o)              (RVAL2GFLAGS(o, G_TYPE_KEY_FILE_FLAGS))
+#define GKEYFILEFLAGS2RVAL(o)              (GFLAGS2RVAL(o, G_TYPE_KEY_FILE_FLAGS))
+
+#endif /* __GLIB2CONVERSIONS_H__ */

data/ext/glib2/rbglib_bookmarkfile.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbglib_bookmarkfile.c -
-
-  $Author: sakai $
-  $Date: 2007/07/07 08:25:33 $
-
-  Copyright (C) 2006 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Masao Mutoh
+ *
+ *  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"
 
@@ -26,8 +36,7 @@ bookmarkfile_copy(const GBookmarkFile* file)
     return (GBookmarkFile*)file;
 }
 
-
-GType
+static GType
 g_bookmark_file_get_type(void)
 {
     static GType our_type = 0;
@@ -40,17 +49,19 @@ g_bookmark_file_get_type(void)
 /************************************************/
 
 #define G_TYPE_BOOKMARK_FILE (g_bookmark_file_get_type())
+
+#define RG_TARGET_NAMESPACE cBookmarkFile
 #define _SELF(self) ((GBookmarkFile*)(RVAL2BOXED(self, G_TYPE_BOOKMARK_FILE)))
 
 static VALUE
-bf_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, g_bookmark_file_new());
     return Qnil;
 }
 
 static VALUE
-bf_load_from_file(VALUE self, VALUE rbfilename)
+rg_load_from_file(VALUE self, VALUE rbfilename)
 {
     gchar *filename = RVAL2CSTRFILENAME(rbfilename);
     GError* error = NULL;
@@ -63,22 +74,22 @@ bf_load_from_file(VALUE self, VALUE rbfilename)
 }
 
 static VALUE
-bf_load_from_data(VALUE self, VALUE data)
+rg_load_from_data(VALUE self, VALUE data)
 {
     GError *error = NULL;
 
     StringValue(data);
     if (!g_bookmark_file_load_from_data(_SELF(self),
-					RSTRING_PTR(data),
-					RSTRING_LEN(data),
-					&error))
-	RAISE_GERROR(error);
+                                        RSTRING_PTR(data),
+                                        RSTRING_LEN(data),
+                                        &error))
+        RAISE_GERROR(error);
 
     return Qnil;
 }
 
 static VALUE
-bf_load_from_data_dirs(VALUE self, VALUE file)
+rg_load_from_data_dirs(VALUE self, VALUE file)
 {
     GError* error = NULL;
     gboolean ret;
@@ -94,18 +105,18 @@ bf_load_from_data_dirs(VALUE self, VALUE file)
 }
 
 static VALUE
-bf_to_data(VALUE self)
+rg_to_data(VALUE self)
 {
     GError* error = NULL;
     gchar* data = g_bookmark_file_to_data(_SELF(self), NULL, &error);
 
     if (error) RAISE_GERROR(error);
-    
+
     return CSTR2RVAL_FREE(data);
 }
 
 static VALUE
-bf_to_file(VALUE self, VALUE rbfilename)
+rg_to_file(VALUE self, VALUE rbfilename)
 {
     gchar *filename = RVAL2CSTRFILENAME(rbfilename);
     GError* error = NULL;
@@ -118,14 +129,14 @@ bf_to_file(VALUE self, VALUE rbfilename)
 }
 
 static VALUE
-bf_has_item(VALUE self, VALUE uri)
+rg_has_item_p(VALUE self, VALUE uri)
 {
     return CBOOL2RVAL(g_bookmark_file_has_item(_SELF(self),
                                                RVAL2CSTR(uri))); 
 }
 
 static VALUE
-bf_has_group(VALUE self, VALUE uri, VALUE group)
+rg_has_group_p(VALUE self, VALUE uri, VALUE group)
 {
     GError* error = NULL;
     return CBOOL2RVAL(g_bookmark_file_has_group(_SELF(self),
@@ -133,9 +144,9 @@ bf_has_group(VALUE self, VALUE uri, VALUE group)
                                                 RVAL2CSTR(group),
                                                 &error));
 }
-	                                           
+
 static VALUE
-bf_has_application(VALUE self, VALUE uri, VALUE name)
+rg_has_application_p(VALUE self, VALUE uri, VALUE name)
 {
     GError* error = NULL;
     return CBOOL2RVAL(g_bookmark_file_has_application(_SELF(self),
@@ -143,21 +154,21 @@ bf_has_application(VALUE self, VALUE uri, VALUE name)
                                                       RVAL2CSTR(name),
                                                       &error));
 }
-	                                           
+
 static VALUE
-bf_get_size(VALUE self)
+rg_size(VALUE self)
 {
     return INT2NUM(g_bookmark_file_get_size(_SELF(self)));
 }
 
 static VALUE
-bf_get_uris(VALUE self)
+rg_uris(VALUE self)
 {
     return STRV2RVAL_FREE(g_bookmark_file_get_uris(_SELF(self), NULL));
 }
 
 static VALUE
-bf_get_title(VALUE self, VALUE uri)
+rg_get_title(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gchar* ret = g_bookmark_file_get_title(_SELF(self),
@@ -168,7 +179,7 @@ bf_get_title(VALUE self, VALUE uri)
 }
 
 static VALUE
-bf_get_description(VALUE self, VALUE uri)
+rg_get_description(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gchar* ret = g_bookmark_file_get_description(_SELF(self),
@@ -179,7 +190,7 @@ bf_get_description(VALUE self, VALUE uri)
 }
 
 static VALUE
-bf_get_mime_type(VALUE self, VALUE uri)
+rg_get_mime_type(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gchar* ret = g_bookmark_file_get_mime_type(_SELF(self),
@@ -190,7 +201,7 @@ bf_get_mime_type(VALUE self, VALUE uri)
 }
 
 static VALUE
-bf_get_is_private(VALUE self, VALUE uri)
+rg_private_p(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gboolean ret = g_bookmark_file_get_is_private(_SELF(self),
@@ -201,7 +212,7 @@ bf_get_is_private(VALUE self, VALUE uri)
 }
 
 static VALUE
-bf_get_icon(VALUE self, VALUE uri)
+rg_get_icon(VALUE self, VALUE uri)
 {
     gchar* href;
     gchar* mime_type;
@@ -218,7 +229,7 @@ bf_get_icon(VALUE self, VALUE uri)
 }
 
 static VALUE
-bf_get_added(VALUE self, VALUE uri)
+rg_get_added(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     time_t ret = g_bookmark_file_get_added(_SELF(self),
@@ -230,7 +241,7 @@ bf_get_added(VALUE self, VALUE uri)
 }
 
 static VALUE
-bf_get_modified(VALUE self, VALUE uri)
+rg_get_modified(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     time_t ret = g_bookmark_file_get_modified(_SELF(self),
@@ -242,7 +253,7 @@ bf_get_modified(VALUE self, VALUE uri)
 }
 
 static VALUE
-bf_get_visited(VALUE self, VALUE uri)
+rg_get_visited(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     time_t ret = g_bookmark_file_get_visited(_SELF(self),
@@ -254,7 +265,7 @@ bf_get_visited(VALUE self, VALUE uri)
 }
 
 static VALUE
-bf_get_groups(VALUE self, VALUE uri)
+rg_get_groups(VALUE self, VALUE uri)
 {
     gsize length;
     VALUE ary;
@@ -264,7 +275,6 @@ bf_get_groups(VALUE self, VALUE uri)
                                              RVAL2CSTR(uri),
                                              &length, &error);
     if (error) RAISE_GERROR(error);
-  
 
     ary = rb_ary_new();
     for(i = 0; i < length; i++){
@@ -276,7 +286,7 @@ bf_get_groups(VALUE self, VALUE uri)
 }
 
 static VALUE
-bf_get_applications(VALUE self, VALUE uri)
+rg_get_applications(VALUE self, VALUE uri)
 {
     gsize length;
     VALUE ary;
@@ -286,7 +296,6 @@ bf_get_applications(VALUE self, VALUE uri)
                                                    RVAL2CSTR(uri),
                                                    &length, &error);
     if (error) RAISE_GERROR(error);
-  
 
     ary = rb_ary_new();
     for(i = 0; i < length; i++){
@@ -296,9 +305,9 @@ bf_get_applications(VALUE self, VALUE uri)
     g_strfreev(ret);
     return ary;
 }
-  
+
 static VALUE
-bf_get_app_info(VALUE self, VALUE uri, VALUE name)
+rg_get_app_info(VALUE self, VALUE uri, VALUE name)
 {
     gchar* exec;
     guint count;
@@ -310,12 +319,12 @@ bf_get_app_info(VALUE self, VALUE uri, VALUE name)
                                                 RVAL2CSTR(name),
                                                 &exec, &count, &stamp, &error);
     if (!ret) RAISE_GERROR(error);
-    
+
     return rb_ary_new3(3, CSTR2RVAL(exec), UINT2NUM(count), rb_time_new(stamp, 0));
 }
 
 static VALUE
-bf_set_title(VALUE self, VALUE uri, VALUE title)
+rg_set_title(VALUE self, VALUE uri, VALUE title)
 {
     g_bookmark_file_set_title(_SELF(self),
                               RVAL2CSTR(uri),
@@ -324,7 +333,7 @@ bf_set_title(VALUE self, VALUE uri, VALUE title)
 }
 
 static VALUE
-bf_set_description(VALUE self, VALUE uri, VALUE description)
+rg_set_description(VALUE self, VALUE uri, VALUE description)
 {
     g_bookmark_file_set_description(_SELF(self),
                                     RVAL2CSTR(uri),
@@ -333,7 +342,7 @@ bf_set_description(VALUE self, VALUE uri, VALUE description)
 }
 
 static VALUE
-bf_set_mime_type(VALUE self, VALUE uri, VALUE mime_type)
+rg_set_mime_type(VALUE self, VALUE uri, VALUE mime_type)
 {
     g_bookmark_file_set_mime_type(_SELF(self),
                                   RVAL2CSTR(uri),
@@ -342,7 +351,7 @@ bf_set_mime_type(VALUE self, VALUE uri, VALUE mime_type)
 }
 
 static VALUE
-bf_set_is_private(VALUE self, VALUE uri, VALUE is_private)
+rg_set_private(VALUE self, VALUE uri, VALUE is_private)
 {
     g_bookmark_file_set_is_private(_SELF(self),
                                    RVAL2CSTR(uri),
@@ -351,7 +360,7 @@ bf_set_is_private(VALUE self, VALUE uri, VALUE is_private)
 }
 
 static VALUE
-bf_set_icon(VALUE self, VALUE uri, VALUE href, VALUE mime_type)
+rg_set_icon(VALUE self, VALUE uri, VALUE href, VALUE mime_type)
 {
     g_bookmark_file_set_icon(_SELF(self),
                              RVAL2CSTR(uri),
@@ -361,7 +370,7 @@ bf_set_icon(VALUE self, VALUE uri, VALUE href, VALUE mime_type)
 }
 
 static VALUE
-bf_set_added(VALUE self, VALUE uri, VALUE time)
+rg_set_added(VALUE self, VALUE uri, VALUE time)
 {
     g_bookmark_file_set_added(_SELF(self), 
                               RVAL2CSTR(uri),
@@ -370,12 +379,14 @@ bf_set_added(VALUE self, VALUE uri, VALUE time)
 }
 
 static VALUE
-bf_set_groups(VALUE self, VALUE uri, VALUE rbgroups)
+rg_set_groups(VALUE self, VALUE rburi, VALUE rbgroups)
 {
-    VALUE ary = rb_ary_to_ary(rbgroups);
-    const gchar **groups = RVAL2STRV(ary);
-    
-    g_bookmark_file_set_groups(_SELF(self), RVAL2CSTR(uri), groups, RARRAY_LEN(ary));
+    GBookmarkFile *bookmark = _SELF(self);
+    const gchar *uri = RVAL2CSTR(rburi);
+    long n;
+    const gchar **groups = RVAL2STRS(rbgroups, n);
+
+    g_bookmark_file_set_groups(bookmark, uri, groups, n);
 
     g_free(groups);
 
@@ -383,7 +394,7 @@ bf_set_groups(VALUE self, VALUE uri, VALUE rbgroups)
 }
 
 static VALUE
-bf_set_modified(VALUE self, VALUE uri, VALUE time)
+rg_set_modified(VALUE self, VALUE uri, VALUE time)
 {
     g_bookmark_file_set_modified(_SELF(self), 
                                  RVAL2CSTR(uri),
@@ -392,7 +403,7 @@ bf_set_modified(VALUE self, VALUE uri, VALUE time)
 }
 
 static VALUE
-bf_set_visited(VALUE self, VALUE uri, VALUE time)
+rg_set_visited(VALUE self, VALUE uri, VALUE time)
 {
     g_bookmark_file_set_visited(_SELF(self), 
                                 RVAL2CSTR(uri),
@@ -401,7 +412,7 @@ bf_set_visited(VALUE self, VALUE uri, VALUE time)
 }
 
 static VALUE
-bf_set_app_info(VALUE self, VALUE uri, VALUE name, VALUE exec, VALUE count, VALUE stamp)
+rg_set_app_info(VALUE self, VALUE uri, VALUE name, VALUE exec, VALUE count, VALUE stamp)
 {
     GError* error = NULL;
     gboolean ret = g_bookmark_file_set_app_info(_SELF(self),
@@ -411,14 +422,14 @@ bf_set_app_info(VALUE self, VALUE uri, VALUE name, VALUE exec, VALUE count, VALU
                                                 NUM2INT(count),
                                                 (time_t)NUM2LONG(rb_Integer(stamp)),
                                                 &error);
- 
+
     if (! ret) RAISE_GERROR(error);
 
     return self;
 }
 
 static VALUE 
-bf_add_group(VALUE self, VALUE uri, VALUE group)
+rg_add_group(VALUE self, VALUE uri, VALUE group)
 {
     g_bookmark_file_add_group(_SELF(self),
                               RVAL2CSTR(uri),
@@ -427,7 +438,7 @@ bf_add_group(VALUE self, VALUE uri, VALUE group)
 }
 
 static VALUE
-bf_add_application(VALUE self, VALUE uri, VALUE name, VALUE exec)
+rg_add_application(VALUE self, VALUE uri, VALUE name, VALUE exec)
 {
     g_bookmark_file_add_application(_SELF(self),
                                     RVAL2CSTR(uri),
@@ -437,7 +448,7 @@ bf_add_application(VALUE self, VALUE uri, VALUE name, VALUE exec)
 }
 
 static VALUE
-bf_remove_group(VALUE self, VALUE uri, VALUE group)
+rg_remove_group(VALUE self, VALUE uri, VALUE group)
 {
     GError* error = NULL;
     gboolean ret = g_bookmark_file_remove_group(_SELF(self),
@@ -450,7 +461,7 @@ bf_remove_group(VALUE self, VALUE uri, VALUE group)
 }
 
 static VALUE
-bf_remove_application(VALUE self, VALUE uri, VALUE name)
+rg_remove_application(VALUE self, VALUE uri, VALUE name)
 {
     GError *error = NULL;
     gboolean ret = g_bookmark_file_remove_application(_SELF(self),
@@ -462,9 +473,8 @@ bf_remove_application(VALUE self, VALUE uri, VALUE name)
     return self;
 }
 
-
 static VALUE
-bf_remove_item(VALUE self, VALUE uri)
+rg_remove_item(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gboolean ret = g_bookmark_file_remove_item(_SELF(self),
@@ -476,7 +486,7 @@ bf_remove_item(VALUE self, VALUE uri)
 }
 
 static VALUE
-bf_move_item(VALUE self, VALUE old_uri, VALUE new_uri)
+rg_move_item(VALUE self, VALUE old_uri, VALUE new_uri)
 {
     GError *error = NULL;
     gboolean ret = g_bookmark_file_move_item(_SELF(self),
@@ -491,51 +501,51 @@ bf_move_item(VALUE self, VALUE old_uri, VALUE new_uri)
 #endif
 
 void
-Init_glib_bookmark_file()
+Init_glib_bookmark_file(void)
 {
 #if GLIB_CHECK_VERSION(2,12,0)
-    VALUE bf = G_DEF_CLASS(G_TYPE_BOOKMARK_FILE, "BookmarkFile", mGLib);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_BOOKMARK_FILE, "BookmarkFile", mGLib);
 
     G_DEF_ERROR(G_BOOKMARK_FILE_ERROR, "BookmarkFileError", mGLib, 
                 rb_eRuntimeError, G_TYPE_BOOKMARK_FILE_ERROR);
 
-    rb_define_method(bf, "initialize", bf_initialize, 0);
-    rb_define_method(bf, "load_from_file", bf_load_from_file, 1);
-    rb_define_method(bf, "load_from_data", bf_load_from_data, 1);
-    rb_define_method(bf, "load_from_data_dirs", bf_load_from_data_dirs, 1);
-    rb_define_method(bf, "to_data", bf_to_data, 0);
-    rb_define_method(bf, "to_file", bf_to_file, 1);
-    rb_define_method(bf, "has_item?", bf_has_item, 1);
-    rb_define_method(bf, "has_group?", bf_has_group, 2);
-    rb_define_method(bf, "has_application?", bf_has_application, 2);
-    rb_define_method(bf, "size", bf_get_size, 0);
-    rb_define_method(bf, "uris", bf_get_uris, 0);
-    rb_define_method(bf, "get_title", bf_get_title, 1);
-    rb_define_method(bf, "get_description", bf_get_description, 1);
-    rb_define_method(bf, "get_mime_type", bf_get_mime_type, 1);
-    rb_define_method(bf, "private?", bf_get_is_private, 1);
-    rb_define_method(bf, "get_icon", bf_get_icon, 1);
-    rb_define_method(bf, "get_added", bf_get_added, 1);
-    rb_define_method(bf, "get_modified", bf_get_modified, 1);
-    rb_define_method(bf, "get_visited", bf_get_visited, 1);
-    rb_define_method(bf, "get_groups", bf_get_groups, 1);
-    rb_define_method(bf, "get_applications", bf_get_applications, 1);
-    rb_define_method(bf, "get_app_info", bf_get_app_info, 2);
-    rb_define_method(bf, "set_title", bf_set_title, 2);
-    rb_define_method(bf, "set_description", bf_set_description, 2);
-    rb_define_method(bf, "set_mime_type", bf_set_mime_type, 2);
-    rb_define_method(bf, "set_private", bf_set_is_private, 2);
-    rb_define_method(bf, "set_icon", bf_set_icon, 3);
-    rb_define_method(bf, "set_added", bf_set_added, 2);
-    rb_define_method(bf, "set_groups", bf_set_groups, 2);
-    rb_define_method(bf, "set_modified", bf_set_modified, 2);
-    rb_define_method(bf, "set_visited", bf_set_visited, 2);
-    rb_define_method(bf, "set_app_info", bf_set_app_info, 5);
-    rb_define_method(bf, "add_group", bf_add_group, 2);
-    rb_define_method(bf, "add_application", bf_add_application, 3);
-    rb_define_method(bf, "remove_group", bf_remove_group, 2);
-    rb_define_method(bf, "remove_application", bf_remove_application, 2);
-    rb_define_method(bf, "remove_item", bf_remove_item, 1);
-    rb_define_method(bf, "move_item", bf_move_item, 2);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(load_from_file, 1);
+    RG_DEF_METHOD(load_from_data, 1);
+    RG_DEF_METHOD(load_from_data_dirs, 1);
+    RG_DEF_METHOD(to_data, 0);
+    RG_DEF_METHOD(to_file, 1);
+    RG_DEF_METHOD_P(has_item, 1);
+    RG_DEF_METHOD_P(has_group, 2);
+    RG_DEF_METHOD_P(has_application, 2);
+    RG_DEF_METHOD(size, 0);
+    RG_DEF_METHOD(uris, 0);
+    RG_DEF_METHOD(get_title, 1);
+    RG_DEF_METHOD(get_description, 1);
+    RG_DEF_METHOD(get_mime_type, 1);
+    RG_DEF_METHOD_P(private, 1);
+    RG_DEF_METHOD(get_icon, 1);
+    RG_DEF_METHOD(get_added, 1);
+    RG_DEF_METHOD(get_modified, 1);
+    RG_DEF_METHOD(get_visited, 1);
+    RG_DEF_METHOD(get_groups, 1);
+    RG_DEF_METHOD(get_applications, 1);
+    RG_DEF_METHOD(get_app_info, 2);
+    RG_DEF_METHOD(set_title, 2);
+    RG_DEF_METHOD(set_description, 2);
+    RG_DEF_METHOD(set_mime_type, 2);
+    RG_DEF_METHOD(set_private, 2);
+    RG_DEF_METHOD(set_icon, 3);
+    RG_DEF_METHOD(set_added, 2);
+    RG_DEF_METHOD(set_groups, 2);
+    RG_DEF_METHOD(set_modified, 2);
+    RG_DEF_METHOD(set_visited, 2);
+    RG_DEF_METHOD(set_app_info, 5);
+    RG_DEF_METHOD(add_group, 2);
+    RG_DEF_METHOD(add_application, 3);
+    RG_DEF_METHOD(remove_group, 2);
+    RG_DEF_METHOD(remove_application, 2);
+    RG_DEF_METHOD(remove_item, 1);
+    RG_DEF_METHOD(move_item, 2);
 #endif
-}
+}