gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkentrycompletion.c

@@ -1,28 +1,40 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkentrycompletion.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2004,2005 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004,2005 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 cEntryCompletion
 #define _SELF(self) (GTK_ENTRY_COMPLETION(RVAL2GOBJ(self)))
 
 static VALUE
-entryc_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_entry_completion_new());
     return Qnil;
 }
 
 static VALUE
-entryc_get_entry(VALUE self)
+rg_entry(VALUE self)
 {
     return GOBJ2RVAL(gtk_entry_completion_get_entry(_SELF(self)));
 }
@@ -36,7 +48,7 @@ entryc_match_func(GtkEntryCompletion *completion, const gchar *key, GtkTreeIter
 }
 
 static VALUE
-entryc_set_match_func(VALUE self)
+rg_set_match_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -47,7 +59,7 @@ entryc_set_match_func(VALUE self)
 }
 
 static VALUE
-entryc_complete(VALUE self)
+rg_complete(VALUE self)
 {
     gtk_entry_completion_complete(_SELF(self));
     return self;
@@ -55,7 +67,7 @@ entryc_complete(VALUE self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-entryc_insert_prefix(VALUE self)
+rg_insert_prefix(VALUE self)
 {
     gtk_entry_completion_insert_prefix(_SELF(self));
     return self;
@@ -63,21 +75,21 @@ entryc_insert_prefix(VALUE self)
 #endif
 
 static VALUE
-entryc_insert_action_text(VALUE self, VALUE index, VALUE text)
+rg_insert_action_text(VALUE self, VALUE index, VALUE text)
 {
     gtk_entry_completion_insert_action_text(_SELF(self), NUM2INT(index), RVAL2CSTR(text));
     return self;
 }
 
 static VALUE
-entryc_insert_action_markup(VALUE self, VALUE index, VALUE markup)
+rg_insert_action_markup(VALUE self, VALUE index, VALUE markup)
 {
     gtk_entry_completion_insert_action_markup(_SELF(self), NUM2INT(index), RVAL2CSTR(markup));
     return self;
 }
 
 static VALUE
-entryc_delete_action(VALUE self, VALUE index)
+rg_delete_action(VALUE self, VALUE index)
 {
     gtk_entry_completion_delete_action(_SELF(self), NUM2INT(index));
     return self;
@@ -92,60 +104,35 @@ entryc_set_text_column(VALUE self, VALUE column)
 
 #if GTK_CHECK_VERSION(2, 12, 0)
 static VALUE
-entryc_get_completion_prefix(VALUE self)
+rg_completion_prefix(VALUE self)
 {
     return CSTR2RVAL(gtk_entry_completion_get_completion_prefix(_SELF(self)));
 }
 #endif
 
-/* Defined as property
-gint        gtk_entry_completion_get_text_column
-                                            (GtkEntryCompletion *completion);
-void        gtk_entry_completion_set_inline_completion
-                                            (GtkEntryCompletion *completion,
-                                             gboolean inline_completion);
-gboolean    gtk_entry_completion_get_inline_completion
-                                            (GtkEntryCompletion *completion);
-void        gtk_entry_completion_set_popup_completion
-                                            (GtkEntryCompletion *completion,
-                                             gboolean popup_completion);
-gboolean    gtk_entry_completion_get_popup_completion
-                                            (GtkEntryCompletion *completion);
-void        gtk_entry_completion_set_popup_set_width
-                                            (GtkEntryCompletion *completion,
-                                             gboolean popup_set_width);
-gboolean    gtk_entry_completion_get_popup_set_width
-                                            (GtkEntryCompletion *completion);
-void        gtk_entry_completion_set_popup_single_match
-                                            (GtkEntryCompletion *completion,
-                                             gboolean popup_single_match);
-gboolean    gtk_entry_completion_get_popup_single_match
-                                            (GtkEntryCompletion *completion);
-*/
-
 #endif
 
 void 
-Init_gtk_entry_completion()
+Init_gtk_entry_completion(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gEntryC = G_DEF_CLASS(GTK_TYPE_ENTRY_COMPLETION, "EntryCompletion", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ENTRY_COMPLETION, "EntryCompletion", mGtk);
 
-    rb_define_method(gEntryC, "initialize", entryc_initialize, 0);
-    rb_define_method(gEntryC, "entry", entryc_get_entry, 0);
-    rb_define_method(gEntryC, "set_match_func", entryc_set_match_func, 0);
-    rb_define_method(gEntryC, "complete", entryc_complete, 0);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(entry, 0);
+    RG_DEF_METHOD(set_match_func, 0);
+    RG_DEF_METHOD(complete, 0);
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gEntryC, "insert_prefix", entryc_insert_prefix, 0);
+    RG_DEF_METHOD(insert_prefix, 0);
 #endif
-    rb_define_method(gEntryC, "insert_action_text", entryc_insert_action_text, 2);
-    rb_define_method(gEntryC, "insert_action_markup", entryc_insert_action_markup, 2);
-    rb_define_method(gEntryC, "delete_action", entryc_delete_action, 1);
+    RG_DEF_METHOD(insert_action_text, 2);
+    RG_DEF_METHOD(insert_action_markup, 2);
+    RG_DEF_METHOD(delete_action, 1);
 
-    G_REPLACE_SET_PROPERTY(gEntryC, "text_column", entryc_set_text_column, 1);
+    G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "text_column", entryc_set_text_column, 1);
 
 #if GTK_CHECK_VERSION(2, 12, 0)
-    rb_define_method(gEntryC, "completion_prefix", entryc_get_completion_prefix, 0);
+    RG_DEF_METHOD(completion_prefix, 0);
 #endif
 #endif
 }

data/ext/gtk2/rbgtkeventbox.c

@@ -1,30 +1,42 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkeventbox.c -
-
-  $Author: mutoh $
-  $Date: 2003/02/01 16:46:23 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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 cEventBox
+
 static VALUE
-eventbox_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_event_box_new());
     return Qnil;
 }
 
 void 
-Init_gtk_eventbox()
+Init_gtk_eventbox(VALUE mGtk)
 {
-    VALUE gEventBox = G_DEF_CLASS(GTK_TYPE_EVENT_BOX, "EventBox", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_EVENT_BOX, "EventBox", mGtk);
 
-    rb_define_method(gEventBox, "initialize", eventbox_initialize, 0);
+    RG_DEF_METHOD(initialize, 0);
 }

data/ext/gtk2/rbgtkexpander.c

@@ -1,22 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkexpander.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  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 cExpander
 #define _SELF(self) (GTK_EXPANDER(RVAL2GOBJ(self)))
 
 static VALUE
-expander_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, with_mnemonic;
     GtkWidget* widget = NULL;
@@ -31,34 +42,14 @@ expander_initialize(int argc, VALUE *argv, VALUE self)
     RBGTK_INITIALIZE(self, widget);
     return Qnil;
 }
-/* Defined as Property.
-void        gtk_expander_set_expanded       (GtkExpander *expander,
-                                             gboolean expanded);
-gboolean    gtk_expander_get_expanded       (GtkExpander *expander);
-void        gtk_expander_set_spacing        (GtkExpander *expander,
-                                             gint spacing);
-gint        gtk_expander_get_spacing        (GtkExpander *expander);
-void        gtk_expander_set_label          (GtkExpander *expander,
-                                             const gchar *label);
-G_CONST_RETURN gchar* gtk_expander_get_label
-                                            (GtkExpander *expander);
-void        gtk_expander_set_use_underline  (GtkExpander *expander,
-                                             gboolean use_underline);
-gboolean    gtk_expander_get_use_underline  (GtkExpander *expander);
-void        gtk_expander_set_use_markup     (GtkExpander *expander,
-                                             gboolean use_markup);
-gboolean    gtk_expander_get_use_markup     (GtkExpander *expander);
-void        gtk_expander_set_label_widget   (GtkExpander *expander,
-                                             GtkWidget *label_widget);
-GtkWidget*  gtk_expander_get_label_widget   (GtkExpander *expander);
- */
+
 #endif
 
 void 
-Init_gtk_expander()
+Init_gtk_expander(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gExpander = G_DEF_CLASS(GTK_TYPE_EXPANDER, "Expander", mGtk);
-    rb_define_method(gExpander, "initialize", expander_initialize, -1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_EXPANDER, "Expander", mGtk);
+    RG_DEF_METHOD(initialize, -1);
 #endif
 }

data/ext/gtk2/rbgtkfilechooser.c

@@ -1,19 +1,30 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
- 
-  rbgtkfilechooser.c -
- 
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
- 
-  Copyright (C) 2005,2006 Ruby-GNOME2 Project Team
-  Copyright (C) 2004 Seiya Nishizawa, Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005,2006 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  Seiya Nishizawa, 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 mFileChooser
 #define _SELF(self) GTK_FILE_CHOOSER(RVAL2GOBJ(self))
 
 #ifdef HAVE_GTK_GTKFILESYSTEM_H
@@ -34,25 +45,8 @@ gslist2ary_free(GSList* list)
     return ary;
 }
 
-/*  They are defined as properties
-    gtk_file_chooser_set_action(_SELF(self), RVAL2GENUM(action, GTK_TYPE_FILE_CHOOSER_ACTION));
-    gtk_file_chooser_get_action(_SELF(self));
-    gtk_file_chooser_set_local_only(_SELF(self), RVAL2CBOOL(local));
-    gtk_file_chooser_get_local_only(_SELF(self));
-    gtk_file_chooser_set_select_multiple(_SELF(self), RVAL2CBOOL(multiple));
-    gtk_file_chooser_get_select_multiple(_SELF(self));
-*/
-
-/*  Defined as Property
-void        gtk_file_chooser_set_show_hidden
-                                            (GtkFileChooser *chooser,
-                                             gboolean show_hidden);
-gboolean    gtk_file_chooser_get_show_hidden
-                                            (GtkFileChooser *chooser);
-*/
-
 static VALUE
-fcho_set_current_name(VALUE self, VALUE name)
+rg_set_current_name(VALUE self, VALUE name)
 {
     /* doc says the awaited string is UTF-8, so use RVAL2CSTR */
     gtk_file_chooser_set_current_name(_SELF(self), RVAL2CSTR(name));
@@ -60,13 +54,13 @@ fcho_set_current_name(VALUE self, VALUE name)
 }
 
 static VALUE
-fcho_get_filename(VALUE self)
+rg_filename(VALUE self)
 {
     return CSTRFILENAME2RVAL_FREE(gtk_file_chooser_get_filename(_SELF(self)));
 }
 
 static VALUE
-fcho_set_filename(VALUE self, VALUE rbfilename)
+rg_set_filename(VALUE self, VALUE rbfilename)
 {
     gchar *filename = RVAL2CSTRFILENAME(rbfilename);
     gboolean ret = gtk_file_chooser_set_filename(_SELF(self), filename);
@@ -78,7 +72,7 @@ fcho_set_filename(VALUE self, VALUE rbfilename)
 }
 
 static VALUE
-fcho_select_filename(VALUE self, VALUE rbfilename)
+rg_select_filename(VALUE self, VALUE rbfilename)
 {
     gchar *filename = RVAL2CSTRFILENAME(rbfilename);
     gboolean ret = gtk_file_chooser_select_filename(_SELF(self), filename);
@@ -88,7 +82,7 @@ fcho_select_filename(VALUE self, VALUE rbfilename)
 }
 
 static VALUE
-fcho_unselect_filename(VALUE self, VALUE rbfilename)
+rg_unselect_filename(VALUE self, VALUE rbfilename)
 {
     gchar *filename = RVAL2CSTRFILENAME(rbfilename);
     gtk_file_chooser_unselect_filename(_SELF(self), filename);
@@ -98,27 +92,27 @@ fcho_unselect_filename(VALUE self, VALUE rbfilename)
 }
 
 static VALUE
-fcho_select_all(VALUE self)
+rg_select_all(VALUE self)
 {
     gtk_file_chooser_select_all(_SELF(self));
     return self;
 }
 
 static VALUE
-fcho_unselect_all(VALUE self)
+rg_unselect_all(VALUE self)
 {
     gtk_file_chooser_unselect_all(_SELF(self));
     return self;
 }
 
 static VALUE
-fcho_get_filenames(VALUE self)
+rg_filenames(VALUE self)
 {
     return CSTRFILENAMEARRAY2RVAL_FREE(gtk_file_chooser_get_filenames(_SELF(self)));
 }
 
 static VALUE
-fcho_set_current_folder(VALUE self, VALUE filename)
+rg_set_current_folder(VALUE self, VALUE filename)
 {
     gboolean ret = gtk_file_chooser_set_current_folder(_SELF(self), RVAL2CSTR(filename));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set current folder");
@@ -126,19 +120,19 @@ fcho_set_current_folder(VALUE self, VALUE filename)
 }
 
 static VALUE
-fcho_get_current_folder(VALUE self)
+rg_current_folder(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_file_chooser_get_current_folder(_SELF(self)));
 }
 
 static VALUE
-fcho_get_uri(VALUE self)
+rg_uri(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_file_chooser_get_uri(_SELF(self)));
 }
 
 static VALUE
-fcho_set_uri(VALUE self, VALUE uri)
+rg_set_uri(VALUE self, VALUE uri)
 {
     gboolean ret = gtk_file_chooser_set_uri(_SELF(self), RVAL2CSTR(uri));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set uri");
@@ -146,26 +140,26 @@ fcho_set_uri(VALUE self, VALUE uri)
 }
 
 static VALUE
-fcho_select_uri(VALUE self, VALUE uri)
+rg_select_uri(VALUE self, VALUE uri)
 {
     return CBOOL2RVAL(gtk_file_chooser_select_uri(_SELF(self), RVAL2CSTR(uri)));
 }
 
 static VALUE
-fcho_unselect_uri(VALUE self, VALUE uri)
+rg_unselect_uri(VALUE self, VALUE uri)
 {
     gtk_file_chooser_unselect_uri(_SELF(self), RVAL2CSTR(uri));
     return self;
 }
 
 static VALUE
-fcho_get_uris(VALUE self)
+rg_uris(VALUE self)
 {
     return gslist2ary_free(gtk_file_chooser_get_uris(_SELF(self)));
 }
 
 static VALUE
-fcho_set_current_folder_uri(VALUE self, VALUE uri)
+rg_set_current_folder_uri(VALUE self, VALUE uri)
 {
     gboolean ret = gtk_file_chooser_set_current_folder_uri(_SELF(self), RVAL2CSTR(uri));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set current folder uri");
@@ -173,65 +167,45 @@ fcho_set_current_folder_uri(VALUE self, VALUE uri)
 }
 
 static VALUE
-fcho_get_current_folder_uri(VALUE self)
+rg_current_folder_uri(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_file_chooser_get_current_folder_uri(_SELF(self)));
 }
 
-/* They are defined as properties.
-    gtk_file_chooser_set_preview_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget));
-    gtk_file_chooser_get_preview_widget(_SELF(self)));
-    gtk_file_chooser_set_preview_widget_active(_SELF(self), RVAL2CBOOL(active));
-    gtk_file_chooser_get_preview_widget_active(_SELF(self));
-    gtk_file_chooser_set_use_preview_label(_SELF(self), RVAL2CBOOL(label));
-    gtk_file_chooser_get_use_preview_label(_SELF(self));
-*/
-
 static VALUE
-fcho_get_preview_filename(VALUE self)
+rg_preview_filename(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_file_chooser_get_preview_filename(_SELF(self)));
 }
 
 static VALUE
-fcho_get_preview_uri(VALUE self)
+rg_preview_uri(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_file_chooser_get_preview_uri(_SELF(self)));
 }
 
-/* They are defined as properties.
-    gtk_file_chooser_set_extra_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)));
-    gtk_file_chooser_get_extra_widget(_SELF(self));
-*/
-
 static VALUE
-fcho_add_filter(VALUE self, VALUE filter)
+rg_add_filter(VALUE self, VALUE filter)
 {
     gtk_file_chooser_add_filter(_SELF(self), GTK_FILE_FILTER(RVAL2GOBJ(filter)));
     return self;
 }
 
 static VALUE
-fcho_remove_filter(VALUE self, VALUE filter)
+rg_remove_filter(VALUE self, VALUE filter)
 {
     gtk_file_chooser_remove_filter(_SELF(self), GTK_FILE_FILTER(RVAL2GOBJ(filter)));
     return self;
 }
 
 static VALUE
-fcho_list_filters(VALUE self)
+rg_filters(VALUE self)
 {
     return GSLIST2ARYF(gtk_file_chooser_list_filters(_SELF(self)));
 }
 
-/*
-  They are defined as property.
-    gtk_file_chooser_set_filter(_SELF(self), GTK_FILE_FILTER(RVAL2GOBJ(filter)));
-    gtk_file_chooser_get_filter(_SELF(self));
-*/
-
 static VALUE
-fcho_add_shortcut_folder(VALUE self, VALUE rbfolder)
+rg_add_shortcut_folder(VALUE self, VALUE rbfolder)
 {
     gchar *folder = RVAL2CSTRFILENAME(rbfolder);
     GError *error = NULL;
@@ -244,7 +218,7 @@ fcho_add_shortcut_folder(VALUE self, VALUE rbfolder)
 }
 
 static VALUE
-fcho_remove_shortcut_folder(VALUE self, VALUE rbfolder)
+rg_remove_shortcut_folder(VALUE self, VALUE rbfolder)
 {
     gchar *folder = RVAL2CSTRFILENAME(rbfolder);
     GError *error = NULL;
@@ -257,14 +231,13 @@ fcho_remove_shortcut_folder(VALUE self, VALUE rbfolder)
 }
 
 static VALUE
-fcho_list_shortcut_folders(VALUE self)
+rg_shortcut_folders(VALUE self)
 {
     return CSTRFILENAMEARRAY2RVAL_FREE(gtk_file_chooser_list_shortcut_folders(_SELF(self)));
 }
 
-
 static VALUE
-fcho_add_shortcut_folder_uri(VALUE self, VALUE uri)
+rg_add_shortcut_folder_uri(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     if (! gtk_file_chooser_add_shortcut_folder_uri(_SELF(self), RVAL2CSTR(uri), &error))
@@ -273,7 +246,7 @@ fcho_add_shortcut_folder_uri(VALUE self, VALUE uri)
 }
 
 static VALUE
-fcho_remove_shortcut_folder_uri(VALUE self, VALUE uri)
+rg_remove_shortcut_folder_uri(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     if (! gtk_file_chooser_remove_shortcut_folder_uri(_SELF(self), RVAL2CSTR(uri), &error))
@@ -282,93 +255,64 @@ fcho_remove_shortcut_folder_uri(VALUE self, VALUE uri)
 }
 
 static VALUE
-fcho_list_shortcut_folder_uris(VALUE self)
+rg_shortcut_folder_uris(VALUE self)
 {
     return gslist2ary_free(gtk_file_chooser_list_shortcut_folder_uris(_SELF(self)));
 }
 #endif
 
-/* Properties.
-void        gtk_file_chooser_set_do_overwrite_confirmation
-                                            (GtkFileChooser *chooser,
-                                             gboolean do_overwrite_confirmation);
-gboolean    gtk_file_chooser_get_do_overwrite_confirmation
-                                           (GtkFileChooser *chooser);
-*/
-
 void 
-Init_gtk_file_chooser()
+Init_gtk_file_chooser(VALUE mGtk)
 {
 
 #if GTK_CHECK_VERSION(2,4,0)
 
-    VALUE gFileCho = G_DEF_INTERFACE(GTK_TYPE_FILE_CHOOSER, "FileChooser", mGtk);
-#ifdef GTK_FILE_SYSTEM_ERROR
-    VALUE eFileSystemError;
-#endif
-
-    rb_define_method(gFileCho, "set_current_name", fcho_set_current_name, 1);
-    rb_define_method(gFileCho, "set_filename", fcho_set_filename, 1);
-    rb_define_method(gFileCho, "filename", fcho_get_filename, 0);
-    rb_define_method(gFileCho, "select_filename", fcho_select_filename, 1);
-    rb_define_method(gFileCho, "unselect_filename", fcho_unselect_filename, 1);
-    rb_define_method(gFileCho, "select_all", fcho_select_all, 0);
-    rb_define_method(gFileCho, "unselect_all", fcho_unselect_all, 0);
-    rb_define_method(gFileCho, "filenames", fcho_get_filenames, 0);
-    rb_define_method(gFileCho, "set_current_folder", fcho_set_current_folder, 1);
-    rb_define_method(gFileCho, "current_folder", fcho_get_current_folder, 0);
-    rb_define_method(gFileCho, "set_uri", fcho_set_uri, 1);
-    rb_define_method(gFileCho, "uri", fcho_get_uri, 0);
-    rb_define_method(gFileCho, "select_uri", fcho_select_uri, 1);
-    rb_define_method(gFileCho, "unselect_uri", fcho_unselect_uri, 1);
-    rb_define_method(gFileCho, "uris", fcho_get_uris, 0);
-    rb_define_method(gFileCho, "set_current_folder_uri", fcho_set_current_folder_uri, 1);
-    rb_define_method(gFileCho, "current_folder_uri", fcho_get_current_folder_uri, 0);
-    rb_define_method(gFileCho, "preview_filename", fcho_get_preview_filename, 0);
-    rb_define_method(gFileCho, "preview_uri", fcho_get_preview_uri, 0);
-    rb_define_method(gFileCho, "add_filter", fcho_add_filter, 1);
-    rb_define_method(gFileCho, "remove_filter", fcho_remove_filter, 1);
-    rb_define_method(gFileCho, "filters", fcho_list_filters, 0);
-    rb_define_method(gFileCho, "add_shortcut_folder", fcho_add_shortcut_folder, 1);
-    rb_define_method(gFileCho, "remove_shortcut_folder", fcho_remove_shortcut_folder, 1);
-    rb_define_method(gFileCho, "shortcut_folders", fcho_list_shortcut_folders, 0);
-    rb_define_method(gFileCho, "add_shortcut_folder_uri", fcho_add_shortcut_folder_uri, 1);
-    rb_define_method(gFileCho, "remove_shortcut_folder_uri", fcho_remove_shortcut_folder_uri, 1);
-
-    rb_define_method(gFileCho, "shortcut_folder_uris", fcho_list_shortcut_folder_uris, 0);
-
-    G_DEF_SETTERS(gFileCho);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(GTK_TYPE_FILE_CHOOSER, "FileChooser", mGtk);
+
+    RG_DEF_METHOD(set_current_name, 1);
+    RG_DEF_METHOD(set_filename, 1);
+    RG_DEF_METHOD(filename, 0);
+    RG_DEF_METHOD(select_filename, 1);
+    RG_DEF_METHOD(unselect_filename, 1);
+    RG_DEF_METHOD(select_all, 0);
+    RG_DEF_METHOD(unselect_all, 0);
+    RG_DEF_METHOD(filenames, 0);
+    RG_DEF_METHOD(set_current_folder, 1);
+    RG_DEF_METHOD(current_folder, 0);
+    RG_DEF_METHOD(set_uri, 1);
+    RG_DEF_METHOD(uri, 0);
+    RG_DEF_METHOD(select_uri, 1);
+    RG_DEF_METHOD(unselect_uri, 1);
+    RG_DEF_METHOD(uris, 0);
+    RG_DEF_METHOD(set_current_folder_uri, 1);
+    RG_DEF_METHOD(current_folder_uri, 0);
+    RG_DEF_METHOD(preview_filename, 0);
+    RG_DEF_METHOD(preview_uri, 0);
+    RG_DEF_METHOD(add_filter, 1);
+    RG_DEF_METHOD(remove_filter, 1);
+    RG_DEF_METHOD(filters, 0);
+    RG_DEF_METHOD(add_shortcut_folder, 1);
+    RG_DEF_METHOD(remove_shortcut_folder, 1);
+    RG_DEF_METHOD(shortcut_folders, 0);
+    RG_DEF_METHOD(add_shortcut_folder_uri, 1);
+    RG_DEF_METHOD(remove_shortcut_folder_uri, 1);
+
+    RG_DEF_METHOD(shortcut_folder_uris, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* GtkFileChooserAction */
-    G_DEF_CLASS(GTK_TYPE_FILE_CHOOSER_ACTION, "Action", gFileCho);
-    G_DEF_CONSTANTS(gFileCho, GTK_TYPE_FILE_CHOOSER_ACTION, "GTK_FILE_CHOOSER_");
+    G_DEF_CLASS(GTK_TYPE_FILE_CHOOSER_ACTION, "Action", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_FILE_CHOOSER_ACTION, "GTK_FILE_CHOOSER_");
 
     /* GtkFileChooserError */
     G_DEF_ERROR(GTK_FILE_CHOOSER_ERROR, "FileChooserError", mGtk, rb_eRuntimeError, 
                 GTK_TYPE_FILE_CHOOSER_ERROR);
 
-#ifdef GTK_FILE_SYSTEM_ERROR
-    /* GtkFileSystemError */
-    eFileSystemError = G_DEF_ERROR2(GTK_FILE_SYSTEM_ERROR, "FileSystemError",
-				    mGtk, rb_eRuntimeError);
-    rb_define_const(eFileSystemError, "NONEXISTENT",
-		    INT2NUM(GTK_FILE_SYSTEM_ERROR_NONEXISTENT));
-    rb_define_const(eFileSystemError, "NOT_FOLDER",
-		    INT2NUM(GTK_FILE_SYSTEM_ERROR_NOT_FOLDER));
-    rb_define_const(eFileSystemError, "INVALID_URI",
-		    INT2NUM(GTK_FILE_SYSTEM_ERROR_INVALID_URI));
-    rb_define_const(eFileSystemError, "BAD_FILENAME",
-		    INT2NUM(GTK_FILE_SYSTEM_ERROR_BAD_FILENAME));
-    rb_define_const(eFileSystemError, "FAILED",
-		    INT2NUM(GTK_FILE_SYSTEM_ERROR_FAILED));
-    rb_define_const(eFileSystemError, "ALREADY_EXSITS",
-		    INT2NUM(GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS));
-#endif
-
 #if GTK_CHECK_VERSION(2,8,0)
     /* GtkFileChooserConfirmation */
-    G_DEF_CLASS(GTK_TYPE_FILE_CHOOSER_CONFIRMATION, "Confirmation", gFileCho);
-    G_DEF_CONSTANTS(gFileCho, GTK_TYPE_FILE_CHOOSER_CONFIRMATION, "GTK_FILE_CHOOSER_");
+    G_DEF_CLASS(GTK_TYPE_FILE_CHOOSER_CONFIRMATION, "Confirmation", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_FILE_CHOOSER_CONFIRMATION, "GTK_FILE_CHOOSER_");
 #endif
 
     G_DEF_CLASS3("GtkFileChooserEmbed", "FileChooserEmbed", mGtk);