gtk2 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/gtk2/rbgtkaccessible.c

@@ -1,28 +1,39 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkaccessible.c -
-
-  $Author: mutoh $
-  $Date: 2003/05/24 03:27:02 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  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 "global.h"
 
+#define RG_TARGET_NAMESPACE cAccessible
+
 static VALUE
-access_connect_widget_destroyed(VALUE self)
+rg_connect_widget_destroyed(VALUE self)
 {
     gtk_accessible_connect_widget_destroyed(GTK_ACCESSIBLE(RVAL2GOBJ(self)));
     return self;
 }
 
 void
-Init_gtk_accessible()
+Init_gtk_accessible(VALUE mGtk)
 {
-    VALUE gAccess = G_DEF_CLASS(GTK_TYPE_ACCESSIBLE, "Accessible", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ACCESSIBLE, "Accessible", mGtk);
 
-    rb_define_method(gAccess, "connect_widget_destroyed", access_connect_widget_destroyed, 0);
+    RG_DEF_METHOD(connect_widget_destroyed, 0);
 }
-

data/ext/gtk2/rbgtkaction.c

@@ -1,23 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkaction.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2004-2006 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004-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 "global.h"
 
 #if GTK_CHECK_VERSION(2,4,0)
 
+#define RG_TARGET_NAMESPACE cAction
 #define _SELF(self) (GTK_ACTION(RVAL2GOBJ(self)))
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-action_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE name, label, tooltip, stock_id;
     const gchar *stock = NULL;
@@ -37,120 +48,109 @@ action_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-action_is_sensitive(VALUE self)
+rg_is_sensitive_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_action_is_sensitive(_SELF(self)));
 }
 
 static VALUE
-action_is_visible(VALUE self)
+rg_is_visible_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_action_is_visible(_SELF(self)));
 }
 
-/* Defined as property.
-const gchar* gtk_action_get_name            (GtkAction *action);
-gboolean    gtk_action_get_sensitive        (GtkAction *action);
-void                gtk_action_set_sensitive            (GtkAction *action,
-                                                         gboolean
-                                                         sensitive);
-gboolean    gtk_action_get_visible          (GtkAction *action);
-void                gtk_action_set_visible              (GtkAction *action,
-                                                         gboolean visible);
-*/
-
 static VALUE
-action_activate(VALUE self)
+rg_activate(VALUE self)
 {
     gtk_action_activate(_SELF(self));
     return self;
 }
 
 static VALUE
-action_create_icon(VALUE self, VALUE icon_size)
+rg_create_icon(VALUE self, VALUE icon_size)
 {
     return GOBJ2RVAL(gtk_action_create_icon(_SELF(self), 
                                             RVAL2GENUM(icon_size, GTK_TYPE_ICON_SIZE)));
 }
 
 static VALUE
-action_create_menu_item(VALUE self)
+rg_create_menu_item(VALUE self)
 {
     return GOBJ2RVAL(gtk_action_create_menu_item(_SELF(self)));
 }
 
 #if GTK_CHECK_VERSION(2, 12, 0)
 static VALUE
-action_create_menu(VALUE self)
+rg_create_menu(VALUE self)
 {
     return GOBJ2RVAL(gtk_action_create_menu(_SELF(self)));
 }
 #endif
 
 static VALUE
-action_create_tool_item(VALUE self)
+rg_create_tool_item(VALUE self)
 {
     return GOBJ2RVAL(gtk_action_create_tool_item(_SELF(self)));
 }
 
 static VALUE
-action_connect_proxy(VALUE self, VALUE proxy)
+rg_connect_proxy(VALUE self, VALUE proxy)
 {
     gtk_action_connect_proxy(_SELF(self), RVAL2WIDGET(proxy));
     return self;
 }
 
 static VALUE
-action_disconnect_proxy(VALUE self, VALUE proxy)
+rg_disconnect_proxy(VALUE self, VALUE proxy)
 {
     gtk_action_disconnect_proxy(_SELF(self), RVAL2WIDGET(proxy));
     return self;
 }
 
 static VALUE
-action_get_proxies(VALUE self)
+rg_proxies(VALUE self)
 {
     /* Owned by GTK+ */
     return GSLIST2ARY(gtk_action_get_proxies(_SELF(self)));
 }
 
 static VALUE
-action_connect_accelerator(VALUE self)
+rg_connect_accelerator(VALUE self)
 {
     gtk_action_connect_accelerator(_SELF(self));
     return self;
 }
 
 static VALUE
-action_disconnect_accelerator(VALUE self)
+rg_disconnect_accelerator(VALUE self)
 {
     gtk_action_disconnect_accelerator(_SELF(self));
     return self;
 }
 
 static VALUE
-action_block_activate_from(VALUE self, VALUE proxy)
+rg_block_activate_from(VALUE self, VALUE proxy)
 {
     gtk_action_block_activate_from(_SELF(self), RVAL2WIDGET(proxy));
     return self;
 }
 
 static VALUE
-action_unblock_activate_from(VALUE self, VALUE proxy)
+rg_unblock_activate_from(VALUE self, VALUE proxy)
 {
     gtk_action_unblock_activate_from(_SELF(self), RVAL2WIDGET(proxy));
     return self;
 }
 
 static VALUE
-action_set_accel_path(VALUE self, VALUE accel_path)
+rg_set_accel_path(VALUE self, VALUE accel_path)
 {
     gtk_action_set_accel_path(_SELF(self), RVAL2CSTR(accel_path));
     return self;
 }
 
 static VALUE
-action_set_accel_group(VALUE self, VALUE accel_group)
+rg_set_accel_group(VALUE self, VALUE accel_group)
 {
     gtk_action_set_accel_group(_SELF(self), RVAL2GOBJ(accel_group));
     return self;
@@ -158,7 +158,7 @@ action_set_accel_group(VALUE self, VALUE accel_group)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-action_get_accel_path(VALUE self)
+rg_accel_path(VALUE self)
 {
     return CSTR2RVAL(gtk_action_get_accel_path(_SELF(self)));
 }
@@ -166,7 +166,7 @@ action_get_accel_path(VALUE self)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-action_get_accel_closure(VALUE self)
+rg_accel_closure(VALUE self)
 {
     return BOXED2RVAL(gtk_action_get_accel_closure(_SELF(self)), G_TYPE_CLOSURE);
 }
@@ -180,24 +180,24 @@ action_mark(void *p)
 
     action = GTK_ACTION(p);
     for (node = gtk_action_get_proxies(action);
-	 node;
-	 node = g_slist_next(node)) {
-	GtkWidget *proxy = node->data;
-	rbgobj_gc_mark_instance(proxy);
+         node;
+         node = g_slist_next(node)) {
+        GtkWidget *proxy = node->data;
+        rbgobj_gc_mark_instance(proxy);
     }
 }
 #endif
 
 void
-Init_gtk_action()
+Init_gtk_action(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gAction;
+    VALUE RG_TARGET_NAMESPACE;
 
-    gAction = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_ACTION, "Action", mGtk,
-				       action_mark, NULL);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_ACTION, "Action", mGtk,
+                                                   action_mark, NULL);
 
-    rb_define_method(gAction, "initialize", action_initialize, -1);
+    RG_DEF_METHOD(initialize, -1);
     /* (NOTICE) Gtk::Action#is_sensitive?, #is_visible are special.
        Because there are also Gtk::Action#sensitive?, #visible? as property 
        accessors. 
@@ -205,33 +205,33 @@ Init_gtk_action()
        action group.
        Gtk::Action#sensitive?, #visible? returns the value of the properties.
     */
-    rb_define_method(gAction, "is_sensitive?", action_is_sensitive, 0);
-    rb_define_method(gAction, "is_visible?", action_is_visible, 0);
-    rb_define_method(gAction, "activate", action_activate, 0);
-    rb_define_method(gAction, "create_icon", action_create_icon, 1);
-    rb_define_method(gAction, "create_menu_item", action_create_menu_item, 0);
+    RG_DEF_METHOD_P(is_sensitive, 0);
+    RG_DEF_METHOD_P(is_visible, 0);
+    RG_DEF_METHOD(activate, 0);
+    RG_DEF_METHOD(create_icon, 1);
+    RG_DEF_METHOD(create_menu_item, 0);
 #if GTK_CHECK_VERSION(2, 12, 0)
-    rb_define_method(gAction, "create_menu", action_create_menu, 0);
+    RG_DEF_METHOD(create_menu, 0);
 #endif
-    rb_define_method(gAction, "create_tool_item", action_create_tool_item, 0);
-    rb_define_method(gAction, "connect_proxy", action_connect_proxy, 1);
-    rb_define_method(gAction, "disconnect_proxy", action_disconnect_proxy, 1);
-    rb_define_method(gAction, "proxies", action_get_proxies, 0);
-    rb_define_method(gAction, "connect_accelerator", action_connect_accelerator, 0);
-    rb_define_method(gAction, "disconnect_accelerator", action_disconnect_accelerator, 0);
-    rb_define_method(gAction, "block_activate_from", action_block_activate_from, 1);
-    rb_define_method(gAction, "unblock_activate_from", action_unblock_activate_from, 1);
-    rb_define_method(gAction, "set_accel_path", action_set_accel_path, 1);
-    G_DEF_SETTER(gAction, "accel_path");
-    rb_define_method(gAction, "set_accel_group", action_set_accel_group, 1);
-    G_DEF_SETTER(gAction, "accel_group");
+    RG_DEF_METHOD(create_tool_item, 0);
+    RG_DEF_METHOD(connect_proxy, 1);
+    RG_DEF_METHOD(disconnect_proxy, 1);
+    RG_DEF_METHOD(proxies, 0);
+    RG_DEF_METHOD(connect_accelerator, 0);
+    RG_DEF_METHOD(disconnect_accelerator, 0);
+    RG_DEF_METHOD(block_activate_from, 1);
+    RG_DEF_METHOD(unblock_activate_from, 1);
+    RG_DEF_METHOD(set_accel_path, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "accel_path");
+    RG_DEF_METHOD(set_accel_group, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "accel_group");
 
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gAction, "accel_path", action_get_accel_path, 0);
+    RG_DEF_METHOD(accel_path, 0);
 #endif
 
 #if GTK_CHECK_VERSION(2,8,0)
-    rb_define_method(gAction, "accel_closure", action_get_accel_closure, 0);
+    RG_DEF_METHOD(accel_closure, 0);
 #endif
 #endif
 }

data/ext/gtk2/rbgtkactiongroup.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkactiongroup.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2004-2006 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004-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 "global.h"
 
@@ -16,40 +26,31 @@
 static ID id_action_procs;
 static ID id_toggle_action_procs;
 
+#define RG_TARGET_NAMESPACE cActionGroup
 #define _SELF(self) (GTK_ACTION_GROUP(RVAL2GOBJ(self)))
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-actiongroup_initialize(VALUE self, VALUE name)
+rg_initialize(VALUE self, VALUE name)
 {
     G_INITIALIZE(self, gtk_action_group_new(RVAL2CSTR(name)));
     return Qnil;
 }
 
-/* Defined as properties
-const gchar* gtk_action_group_get_name      (GtkActionGroup *action_group);
-gboolean    gtk_action_group_get_sensitive  (GtkActionGroup *action_group);
-void        gtk_action_group_set_sensitive  (GtkActionGroup *action_group,
-                                             gboolean sensitive);
-gboolean    gtk_action_group_get_visible    (GtkActionGroup *action_group);
-void        gtk_action_group_set_visible    (GtkActionGroup *action_group,
-                                             gboolean visible);
-*/
-
 static VALUE
-actiongroup_get_action(VALUE self, VALUE action_name)
+rg_get_action(VALUE self, VALUE action_name)
 {
     return GOBJ2RVAL(gtk_action_group_get_action(_SELF(self), RVAL2CSTR(action_name)));
 }
 
 static VALUE
-actiongroup_list_actions(VALUE self)
+rg_actions(VALUE self)
 {
     return GLIST2ARYF(gtk_action_group_list_actions(_SELF(self)));
 }
 
 static VALUE
-actiongroup_add_action(int argc, VALUE *argv, VALUE self)
+rg_add_action(int argc, VALUE *argv, VALUE self)
 {
     VALUE action, accelerator;
 
@@ -64,7 +65,7 @@ actiongroup_add_action(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-actiongroup_remove_action(VALUE self, VALUE action)
+rg_remove_action(VALUE self, VALUE action)
 {
     gtk_action_group_remove_action(_SELF(self), GTK_ACTION(RVAL2GOBJ(action)));
     G_CHILD_REMOVE(self, action);
@@ -74,65 +75,105 @@ actiongroup_remove_action(VALUE self, VALUE action)
 static void
 activate_action(GtkAction *action, VALUE self)
 {
-    VALUE action_procs = rb_ivar_get(self, id_action_procs);
-    VALUE proc = rb_hash_aref(action_procs, CSTR2RVAL(gtk_action_get_name(action)));
-    if (! NIL_P(proc))
+    VALUE proc = rb_hash_aref(rb_ivar_get(self, id_action_procs),
+                              CSTR2RVAL(gtk_action_get_name(action)));
+
+    if (!NIL_P(proc))
         rb_funcall(proc, id_call, 2, self, GOBJ2RVAL(action));
 }
 
+struct rbg_rval2gtkactionentries_args {
+    VALUE ary;
+    long n;
+    GtkActionEntry *result;
+    VALUE procs;
+};
+
 static VALUE
-actiongroup_add_actions(VALUE self, VALUE entries)
+rbg_rval2gtkactionentries_body(VALUE value)
 {
-    guint i;
-    VALUE action_procs;
-    guint n_entries = (guint)RARRAY_LEN(entries);
-    GtkActionEntry* gentries = g_new0(GtkActionEntry, n_entries);
-
-    if (rb_ivar_defined(self, id_action_procs) == Qtrue){
-        action_procs = rb_ivar_get(self, id_action_procs);
-    } else {
-        action_procs = rb_hash_new();
-    }
+    long i;
+    struct rbg_rval2gtkactionentries_args *args = (struct rbg_rval2gtkactionentries_args *)value;
 
-    for (i = 0; i < n_entries; i++){
+    for (i = 0; i < args->n; i++) {
         VALUE entry;
-        int size;
-
-	entry = RARRAY_PTR(entries)[i];
-	size = RARRAY_LEN(entry);
-        if (size < 1)
-            rb_raise(rb_eArgError, "wrong array parameter");
-
-        gentries[i].name = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[0]);
-        gentries[i].callback = G_CALLBACK(activate_action);
-
-        if (size < 2) continue;
-
-        if (NIL_P(RARRAY_PTR(entry)[1])){
-            gentries[i].stock_id = NULL;
-        } else if (SYMBOL_P(RARRAY_PTR(entry)[1])){
-            gentries[i].stock_id = rb_id2name(SYM2ID(RARRAY_PTR(entry)[1]));
-        } else if (TYPE(RARRAY_PTR(entry)[1]) == T_STRING){
-            gentries[i].stock_id = RVAL2CSTR(RARRAY_PTR(entry)[1]);
-        } else{
-            rb_raise(rb_eArgError,
-		     "invalid argument %s (expect Symbol or String)",
-                     rb_class2name(CLASS_OF(RARRAY_PTR(entry)[1])));
+        long n;
+
+        RARRAY_PTR(args->ary)[i] = rb_ary_dup(rb_ary_to_ary(RARRAY_PTR(args->ary)[i]));
+        entry = RARRAY_PTR(args->ary)[i];
+        n = RARRAY_LEN(entry);
+
+        args->result[i].callback = G_CALLBACK(activate_action);
+
+        if (n < 1 || n > 6)
+            rb_raise(rb_eArgError, "entry does not contain right number of entries %ld (1..6)", n);
+
+        args->result[i].name = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[0]);
+
+        switch (n) {
+        case 6:
+            /* TODO: Call #to_proc on entry 5? */
+            rb_hash_aset(args->procs, RARRAY_PTR(entry)[0], RARRAY_PTR(entry)[5]);
+        case 5:
+            args->result[i].tooltip = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[4]);
+        case 4:
+            args->result[i].accelerator = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[3]);
+        case 3:
+            args->result[i].label = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[2]);
+        case 2:
+            args->result[i].stock_id = RVAL2CSTR_ACCEPT_SYMBOL_ACCEPT_NIL(RARRAY_PTR(entry)[1]);
+            break;
+        default:
+            break;
         }
-
-        if (size < 3) continue;
-        gentries[i].label = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[2]);
-        if (size < 4) continue;
-        gentries[i].accelerator = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[3]);
-        if (size < 4) continue;
-        gentries[i].tooltip = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[4]);
-        if (size < 5) continue;
-        rb_hash_aset(action_procs, RARRAY_PTR(entry)[0], RARRAY_PTR(entry)[5]);
     }
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbg_rval2gtkactionentries_rescue(VALUE value)
+{
+    g_free(((struct rbg_rval2gtkactionentries_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static GtkActionEntry *
+rbg_rval2gtkactionentries(volatile VALUE *value, long *n, VALUE procs)
+{
+    struct rbg_rval2gtkactionentries_args args;
+
+    args.ary = *value = rb_ary_dup(rb_ary_to_ary(*value));
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_new0(GtkActionEntry, args.n + 1);
+    args.procs = procs;
+
+    rb_rescue(rbg_rval2gtkactionentries_body, (VALUE)&args,
+              rbg_rval2gtkactionentries_rescue, (VALUE)&args);
+
+    *n = args.n;
+
+    return args.result;
+}
+
+#define RVAL2GTKACTIONENTRIES(value, n, procs) rbg_rval2gtkactionentries(&(value), &(n), procs)
+
+static VALUE
+rg_add_actions(VALUE self, VALUE rbentries)
+{
+    GtkActionGroup *group = _SELF(self);
+    VALUE action_procs = rb_ivar_defined(self, id_action_procs) == Qtrue ?
+        rb_ivar_get(self, id_action_procs) :
+        rb_hash_new();
+    long n;
+    GtkActionEntry *entries = RVAL2GTKACTIONENTRIES(rbentries, n, action_procs);
+
     rb_ivar_set(self, id_action_procs, action_procs);
-    gtk_action_group_add_actions(_SELF(self), gentries, n_entries,
-				 (gpointer)self);
-    g_free(gentries);
+
+    gtk_action_group_add_actions(group, entries, n, (gpointer)self);
+
+    g_free(entries);
 
     return self;
 }
@@ -140,135 +181,216 @@ actiongroup_add_actions(VALUE self, VALUE entries)
 static void
 activate_toggle_action(GtkAction *action, VALUE self)
 {
-    VALUE action_procs = rb_ivar_get(self, id_toggle_action_procs);
-    VALUE proc = rb_hash_aref(action_procs, CSTR2RVAL(gtk_action_get_name(action)));
-    if (! NIL_P(proc))
+    VALUE proc = rb_hash_aref(rb_ivar_get(self, id_toggle_action_procs),
+                              CSTR2RVAL(gtk_action_get_name(action)));
+
+    if (!NIL_P(proc))
         rb_funcall(proc, id_call, 2, self, GOBJ2RVAL(action));
 }
 
+struct rbg_rval2gtktoggleactionentries_args {
+    VALUE ary;
+    long n;
+    GtkToggleActionEntry *result;
+    VALUE procs;
+};
+
 static VALUE
-actiongroup_add_toggle_actions(VALUE self, VALUE entries)
+rbg_rval2gtktoggleactionentries_body(VALUE value)
 {
-    guint i;
-    VALUE toggle_action_procs;
-    guint n_entries = (guint)RARRAY_LEN(entries);
-    GtkToggleActionEntry* gentries = g_new0(GtkToggleActionEntry, n_entries);
-
-    if (rb_ivar_defined(self, id_toggle_action_procs) == Qtrue){
-        toggle_action_procs = rb_ivar_get(self, id_toggle_action_procs);
-    } else {
-        toggle_action_procs = rb_hash_new();
-    }
+    long i;
+    struct rbg_rval2gtktoggleactionentries_args *args = (struct rbg_rval2gtktoggleactionentries_args *)value;
 
-    for (i = 0; i < n_entries; i++){
+    for (i = 0; i < args->n; i++) {
         VALUE entry;
-	int size;
-
-	entry = RARRAY_PTR(entries)[i];
-	size = RARRAY_LEN(entry);
-        if (size < 1)
-            rb_raise(rb_eArgError, "wrong array parameter");
-
-        gentries[i].name = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[0]);
-        gentries[i].callback = G_CALLBACK(activate_toggle_action);
-
-        if (size < 2) continue;
-
-        if (NIL_P(RARRAY_PTR(entry)[1])){
-            gentries[i].stock_id = NULL;
-        } else if (SYMBOL_P(RARRAY_PTR(entry)[1])){
-            gentries[i].stock_id = rb_id2name(SYM2ID(RARRAY_PTR(entry)[1]));
-        } else if (TYPE(RARRAY_PTR(entry)[1]) == T_STRING){
-            gentries[i].stock_id = RVAL2CSTR(RARRAY_PTR(entry)[1]);
-        } else{
-            rb_raise(rb_eArgError, "invalid argument %s (expect Symbol or String)",
-                     rb_class2name(CLASS_OF(RARRAY_PTR(entry)[1])));
+        long n;
+
+        RARRAY_PTR(args->ary)[i] = rb_ary_dup(rb_ary_to_ary(RARRAY_PTR(args->ary)[i]));
+        entry = RARRAY_PTR(args->ary)[i];
+        n = RARRAY_LEN(entry);
+
+        args->result[i].callback = G_CALLBACK(activate_toggle_action);
+
+        if (n < 1 || n > 7)
+            rb_raise(rb_eArgError, "entry does not contain right number of entries %ld (1..7)", n);
+
+        args->result[i].name = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[0]);
+
+        switch (n) {
+        case 7:
+            args->result[i].is_active = RVAL2CBOOL(RARRAY_PTR(entry)[6]);
+        case 6:
+            /* TODO: Call #to_proc on entry 5? */
+            rb_hash_aset(args->procs, RARRAY_PTR(entry)[0], RARRAY_PTR(entry)[5]);
+        case 5:
+            args->result[i].tooltip = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[4]);
+        case 4:
+            args->result[i].accelerator = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[3]);
+        case 3:
+            args->result[i].label = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[2]);
+        case 2:
+            args->result[i].stock_id = RVAL2CSTR_ACCEPT_SYMBOL_ACCEPT_NIL(RARRAY_PTR(entry)[1]);
+            break;
+        default:
+            break;
         }
-
-        if (size < 3) continue;
-        gentries[i].label = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[2]);
-        if (size < 4) continue;
-        gentries[i].accelerator = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[3]);
-        if (size < 4) continue;
-        gentries[i].tooltip = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[4]);
-        if (size < 5) continue;
-        rb_hash_aset(toggle_action_procs,
-		     RARRAY_PTR(entry)[0], RARRAY_PTR(entry)[5]);
-        if (size < 6) continue;
-        gentries[i].is_active = RVAL2CBOOL(RARRAY_PTR(entry)[6]);
     }
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbg_rval2gtktoggleactionentries_rescue(VALUE value)
+{
+    g_free(((struct rbg_rval2gtktoggleactionentries_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static GtkToggleActionEntry *
+rbg_rval2gtktoggleactionentries(volatile VALUE *value, long *n, VALUE procs)
+{
+    struct rbg_rval2gtktoggleactionentries_args args;
+
+    args.ary = *value = rb_ary_dup(rb_ary_to_ary(*value));
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_new0(GtkToggleActionEntry, args.n + 1);
+    args.procs = procs;
+
+    rb_rescue(rbg_rval2gtktoggleactionentries_body, (VALUE)&args,
+              rbg_rval2gtktoggleactionentries_rescue, (VALUE)&args);
+
+    *n = args.n;
+
+    return args.result;
+}
+
+#define RVAL2GTKTOGGLEACTIONENTRIES(value, n, procs) rbg_rval2gtktoggleactionentries(&(value), &(n), procs)
+
+static VALUE
+rg_add_toggle_actions(VALUE self, VALUE rbentries)
+{
+    GtkActionGroup *group = _SELF(self);
+    VALUE toggle_action_procs = rb_ivar_defined(self, id_toggle_action_procs) == Qtrue ?
+        rb_ivar_get(self, id_toggle_action_procs) :
+        rb_hash_new();
+    long n;
+    GtkToggleActionEntry *entries = RVAL2GTKTOGGLEACTIONENTRIES(rbentries, n, toggle_action_procs);
+
     rb_ivar_set(self, id_toggle_action_procs, toggle_action_procs);
-    gtk_action_group_add_toggle_actions(_SELF(self), gentries, n_entries,
-					(gpointer)self);
-    g_free(gentries);
+
+    gtk_action_group_add_toggle_actions(group, entries, n, (gpointer)self);
+
+    g_free(entries);
 
     return self;
 }
 
 static void
-activate_radio_action(GtkAction *action, GtkRadioAction *current, VALUE func)
+activate_radio_action(GtkAction *action, GtkRadioAction *current, VALUE proc)
 {
-    if (! NIL_P(func))
-        rb_funcall(func, id_call, 2, GOBJ2RVAL(action), GOBJ2RVAL(current));
+    if (!NIL_P(proc))
+        rb_funcall(proc, id_call, 2, GOBJ2RVAL(action), GOBJ2RVAL(current));
 }
 
+struct rbg_rval2gtkradioactionentries_args {
+    VALUE ary;
+    long n;
+    GtkRadioActionEntry *result;
+};
+
 static VALUE
-actiongroup_add_radio_actions(int argc, VALUE *argv, VALUE self)
+rbg_rval2gtkradioactionentries_body(VALUE value)
 {
-    VALUE entries, value, proc;
-    guint i;
-    guint n_entries;
-    GtkRadioActionEntry* gentries;
+    long i;
+    struct rbg_rval2gtkradioactionentries_args *args = (struct rbg_rval2gtkradioactionentries_args *)value;
+
+    for (i = 0; i < args->n; i++) {
+        VALUE entry;
+        long n;
+
+        RARRAY_PTR(args->ary)[i] = rb_ary_dup(rb_ary_to_ary(RARRAY_PTR(args->ary)[i]));
+        entry = RARRAY_PTR(args->ary)[i];
+        n = RARRAY_LEN(entry);
+
+        switch (n) {
+        case 6:
+            args->result[i].value = NUM2INT(RARRAY_PTR(entry)[5]);
+        case 5:
+            args->result[i].tooltip = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[4]);
+        case 4:
+            args->result[i].accelerator = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[3]);
+        case 3:
+            args->result[i].label = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[2]);
+        case 2:
+            args->result[i].stock_id = RVAL2CSTR_ACCEPT_SYMBOL_ACCEPT_NIL(RARRAY_PTR(entry)[1]);
+        case 1:
+            args->result[i].name = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[0]);
+        default:
+            rb_raise(rb_eArgError, "entry does not contain right number of entries %ld (1..6)", n);
+        }
+    }
 
-    rb_scan_args(argc, argv, "12", &entries, &value, &proc);
+    return Qnil;
+}
 
-    if (NIL_P(value)) value = -1;
-    if (NIL_P(proc) && rb_block_given_p()){
+static G_GNUC_NORETURN VALUE
+rbg_rval2gtkradioactionentries_rescue(VALUE value)
+{
+    g_free(((struct rbg_rval2gtkradioactionentries_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static GtkRadioActionEntry *
+rbg_rval2gtkradioactionentries(volatile VALUE *value, long *n)
+{
+    struct rbg_rval2gtkradioactionentries_args args;
+
+    args.ary = *value = rb_ary_dup(rb_ary_to_ary(*value));
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_new0(GtkRadioActionEntry, args.n + 1);
+
+    rb_rescue(rbg_rval2gtkradioactionentries_body, (VALUE)&args,
+              rbg_rval2gtkradioactionentries_rescue, (VALUE)&args);
+
+    *n = args.n;
+
+    return args.result;
+}
+
+#define RVAL2GTKRADIOACTIONENTRIES(value, n) rbg_rval2gtkradioactionentries(&(value), &(n))
+
+static VALUE
+rg_add_radio_actions(int argc, VALUE *argv, VALUE self)
+{
+    GtkActionGroup *group = _SELF(self);
+    VALUE rbentries, rbvalue, proc;
+    long n;
+    GtkRadioActionEntry *entries;
+    gint value;
+
+    rb_scan_args(argc, argv, "12", &rbentries, &rbvalue, &proc);
+
+    value = NIL_P(rbvalue) ? -1 : NUM2INT(rbvalue);
+
+    if (NIL_P(proc) && rb_block_given_p()) {
         proc = rb_block_proc();
+        /* TODO: How do we remove this proc when all the radio actions passed
+         * have been removed? */
         G_RELATIVE(self, proc);
     }
-    n_entries = (guint)RARRAY_LEN(entries);
-    gentries = g_new0(GtkRadioActionEntry, n_entries);
 
-    for (i = 0; i < n_entries; i++){
-        VALUE entry;
-	int size;
-
-	entry = RARRAY_PTR(entries)[i];
-	size = RARRAY_LEN(entry);
-        if (size < 1)
-            rb_raise(rb_eArgError, "wrong array parameter");
-
-        gentries[i].name = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[0]);
-
-        if (size < 2) continue;
-
-        if (NIL_P(RARRAY_PTR(entry)[1])){
-            gentries[i].stock_id = NULL;
-        } else if (SYMBOL_P(RARRAY_PTR(entry)[1])){
-            gentries[i].stock_id = rb_id2name(SYM2ID(RARRAY_PTR(entry)[1]));
-        } else if (TYPE(RARRAY_PTR(entry)[1]) == T_STRING){
-            gentries[i].stock_id = RVAL2CSTR(RARRAY_PTR(entry)[1]);
-        } else{
-            rb_raise(rb_eArgError,
-		     "invalid argument %s (expect Symbol or String)",
-                     rb_class2name(CLASS_OF(RARRAY_PTR(entry)[1])));
-        }
+    entries = RVAL2GTKRADIOACTIONENTRIES(rbentries, n);
 
-        if (size < 3) continue;
-        gentries[i].label = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[2]);
-        if (size < 4) continue;
-        gentries[i].accelerator = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[3]);
-        if (size < 4) continue;
-        gentries[i].tooltip = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[4]);
-        if (size < 5) continue;
-        gentries[i].value = NUM2INT(RARRAY_PTR(entry)[5]);
-    }
-    gtk_action_group_add_radio_actions(_SELF(self), gentries,
-				       n_entries, NUM2INT(value),
+    gtk_action_group_add_radio_actions(group,
+                                       entries,
+                                       n,
+                                       value,
                                        G_CALLBACK(activate_radio_action),
-				       (gpointer)proc);
-    g_free(gentries);
+                                       (gpointer)proc);
+
+    g_free(entries);
 
     return self;
 }
@@ -281,7 +403,7 @@ translate_func(const gchar *path, gpointer func)
 }
 
 static VALUE
-actiongroup_set_translate_func(VALUE self)
+rg_set_translate_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -292,7 +414,7 @@ actiongroup_set_translate_func(VALUE self)
 }
 
 static VALUE
-actiongroup_set_translation_domain(VALUE self, VALUE domain)
+rg_set_translation_domain(VALUE self, VALUE domain)
 {
     gtk_action_group_set_translation_domain(_SELF(self), 
                                             NIL_P(domain) ? (const gchar*)NULL : RVAL2CSTR(domain));
@@ -301,7 +423,7 @@ actiongroup_set_translation_domain(VALUE self, VALUE domain)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-actiongroup_translate_string(VALUE self, VALUE str)
+rg_translate_string(VALUE self, VALUE str)
 {
     return CSTR2RVAL(gtk_action_group_translate_string(_SELF(self), RVAL2CSTR(str)));
 }
@@ -316,38 +438,38 @@ action_group_mark(void *p)
     group = GTK_ACTION_GROUP(p);
     actions = gtk_action_group_list_actions(group);
     for (node = actions; node; node = g_list_next(node)) {
-	GtkWidget *action = node->data;
-	rbgobj_gc_mark_instance(action);
+        GtkWidget *action = node->data;
+        rbgobj_gc_mark_instance(action);
     }
     g_list_free(actions);
 }
 #endif
 
 void 
-Init_gtk_actiongroup()
+Init_gtk_actiongroup(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gActionGroup;
+    VALUE RG_TARGET_NAMESPACE;
 
-    gActionGroup = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_ACTION_GROUP, "ActionGroup",
-					    mGtk, action_group_mark, NULL);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_ACTION_GROUP, "ActionGroup",
+                                                    mGtk, action_group_mark, NULL);
 
     id_action_procs = rb_intern("@action_procs");
     id_toggle_action_procs = rb_intern("@toggle_action_procs");
 
-    rb_define_method(gActionGroup, "initialize", actiongroup_initialize, 1);
-    rb_define_method(gActionGroup, "get_action", actiongroup_get_action, 1);
-    rb_define_method(gActionGroup, "actions", actiongroup_list_actions, 0);
-    rb_define_method(gActionGroup, "add_action", actiongroup_add_action, -1);
-    rb_define_method(gActionGroup, "remove_action", actiongroup_remove_action, 1);
-    rb_define_method(gActionGroup, "add_actions", actiongroup_add_actions, 1);
-    rb_define_method(gActionGroup, "add_toggle_actions", actiongroup_add_toggle_actions, 1);
-    rb_define_method(gActionGroup, "add_radio_actions", actiongroup_add_radio_actions, -1);
-    rb_define_method(gActionGroup, "set_translate_func", actiongroup_set_translate_func, 0);
-    rb_define_method(gActionGroup, "set_translation_domain", actiongroup_set_translation_domain, 1);
-    G_DEF_SETTER(gActionGroup, "translation_domain");
+    RG_DEF_METHOD(initialize, 1);
+    RG_DEF_METHOD(get_action, 1);
+    RG_DEF_METHOD(actions, 0);
+    RG_DEF_METHOD(add_action, -1);
+    RG_DEF_METHOD(remove_action, 1);
+    RG_DEF_METHOD(add_actions, 1);
+    RG_DEF_METHOD(add_toggle_actions, 1);
+    RG_DEF_METHOD(add_radio_actions, -1);
+    RG_DEF_METHOD(set_translate_func, 0);
+    RG_DEF_METHOD(set_translation_domain, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "translation_domain");
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gActionGroup, "translate_string", actiongroup_translate_string, 1);
+    RG_DEF_METHOD(translate_string, 1);
 #endif
 #endif
 }