gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkrecentinfo.c

@@ -1,74 +1,84 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkrecentinfo.c -
-
-  $Author: mutoh $
-  $Date: 2006/11/12 15:28:40 $
-
-  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 "global.h"
 
 #if GTK_CHECK_VERSION(2,10,0)
 
+#define RG_TARGET_NAMESPACE cRecentInfo
 #define _SELF(self) ((GtkRecentInfo*)RVAL2BOXED(self, GTK_TYPE_RECENT_INFO))
 
-
 static VALUE
-ri_get_uri(VALUE self)
+rg_uri(VALUE self)
 {
     return CSTR2RVAL(gtk_recent_info_get_uri(_SELF(self)));
 }
 
 static VALUE
-ri_get_display_name(VALUE self)
+rg_display_name(VALUE self)
 {
     return CSTR2RVAL(gtk_recent_info_get_display_name(_SELF(self)));
 }
 
 static VALUE
-ri_get_description(VALUE self)
+rg_description(VALUE self)
 {
     return CSTR2RVAL(gtk_recent_info_get_description(_SELF(self)));
 }
 
 static VALUE
-ri_get_mime_type(VALUE self)
+rg_mime_type(VALUE self)
 {
     return CSTR2RVAL(gtk_recent_info_get_mime_type(_SELF(self)));
 }
 
 static VALUE
-ri_get_added(VALUE self)
+rg_added(VALUE self)
 {
     time_t t = gtk_recent_info_get_added(_SELF(self));
     return rb_funcall(rb_cTime, rb_intern("at"), 1, INT2NUM(t));
 }
 
 static VALUE
-ri_get_modified(VALUE self)
+rg_modified(VALUE self)
 {
     time_t t = gtk_recent_info_get_modified(_SELF(self));
     return rb_funcall(rb_cTime, rb_intern("at"), 1, INT2NUM(t));
 }
 
 static VALUE
-ri_get_visited(VALUE self)
+rg_visited(VALUE self)
 {
     time_t t = gtk_recent_info_get_visited(_SELF(self));
     return rb_funcall(rb_cTime, rb_intern("at"), 1, INT2NUM(t));
 }
 
 static VALUE
-ri_get_private_hint(VALUE self)
+rg_private_hint_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_recent_info_get_private_hint(_SELF(self)));
 }
 
 static VALUE
-ri_get_application_info(VALUE self, VALUE app_name)
+rg_application_info(VALUE self, VALUE app_name)
 {
     const gchar *app_exec;
     guint count;
@@ -88,7 +98,7 @@ ri_get_application_info(VALUE self, VALUE app_name)
 }    
 
 static VALUE
-ri_get_applications(VALUE self)
+rg_applications(VALUE self)
 {
     gsize i;
     gsize length;
@@ -102,13 +112,13 @@ ri_get_applications(VALUE self)
 }
 
 static VALUE
-ri_last_application(VALUE self)
+rg_last_application(VALUE self)
 {
     return CSTR2RVAL(gtk_recent_info_last_application(_SELF(self)));
 }
 
 static VALUE
-ri_get_groups(VALUE self)
+rg_groups(VALUE self)
 {
     gsize i;
     gsize length;
@@ -122,57 +132,57 @@ ri_get_groups(VALUE self)
 }
 
 static VALUE
-ri_has_group(VALUE self, VALUE group_name)
+rg_has_group_p(VALUE self, VALUE group_name)
 {
     return CBOOL2RVAL(gtk_recent_info_has_group(_SELF(self), 
                                                 RVAL2CSTR(group_name)));
 }
 
 static VALUE
-ri_has_application(VALUE self, VALUE app_name)
+rg_has_application_p(VALUE self, VALUE app_name)
 {
     return CBOOL2RVAL(gtk_recent_info_has_application(_SELF(self), 
                                                 RVAL2CSTR(app_name)));
 }
 
 static VALUE
-ri_get_icon(VALUE self, VALUE size)
+rg_get_icon(VALUE self, VALUE size)
 {
     return GOBJ2RVAL(gtk_recent_info_get_icon(_SELF(self), NUM2INT(size)));
 }
 
 static VALUE
-ri_get_short_name(VALUE self)
+rg_short_name(VALUE self)
 {
     return CSTR2RVAL(gtk_recent_info_get_short_name(_SELF(self)));
 }
 
 static VALUE
-ri_get_uri_display(VALUE self)
+rg_uri_display(VALUE self)
 {
     return CSTR2RVAL(gtk_recent_info_get_uri_display(_SELF(self)));
 }
 
 static VALUE
-ri_get_age(VALUE self)
+rg_age(VALUE self)
 {
     return INT2NUM(gtk_recent_info_get_age(_SELF(self)));
 }
 
 static VALUE
-ri_is_local(VALUE self)
+rg_local_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_recent_info_is_local(_SELF(self)));
 }
 
 static VALUE
-ri_exist(VALUE self)
+rg_exist_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_recent_info_exists(_SELF(self)));
 }
 
 static VALUE
-ri_match(VALUE self, VALUE other)
+rg_operator_ri_match(VALUE self, VALUE other)
 {
     return CBOOL2RVAL(gtk_recent_info_match(_SELF(self), _SELF(other)));
 }
@@ -180,32 +190,32 @@ ri_match(VALUE self, VALUE other)
 #endif
 
 void 
-Init_gtk_recent_info()
+Init_gtk_recent_info(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE ri = G_DEF_CLASS(GTK_TYPE_RECENT_INFO, "RecentInfo", mGtk);
-    rb_define_method(ri, "uri", ri_get_uri, 0);
-    rb_define_method(ri, "display_name", ri_get_display_name, 0);
-    rb_define_method(ri, "description", ri_get_description, 0);
-    rb_define_method(ri, "mime_type", ri_get_mime_type, 0);
-    rb_define_method(ri, "added", ri_get_added, 0);
-    rb_define_method(ri, "modified", ri_get_modified, 0);
-    rb_define_method(ri, "visited", ri_get_visited, 0);
-    rb_define_method(ri, "private_hint?", ri_get_private_hint, 0);
-    rb_define_method(ri, "application_info", ri_get_application_info, 1);
-    rb_define_method(ri, "applications", ri_get_applications, 0);
-    rb_define_method(ri, "last_application", ri_last_application, 0);
-    rb_define_method(ri, "groups", ri_get_groups, 0);
-    rb_define_method(ri, "has_group?", ri_has_group, 1);
-    rb_define_method(ri, "has_application?", ri_has_application, 1);
-    rb_define_method(ri, "get_icon", ri_get_icon, 1);
-    rb_define_method(ri, "short_name", ri_get_short_name, 0);
-    rb_define_method(ri, "uri_display", ri_get_uri_display, 0);
-    rb_define_method(ri, "age", ri_get_age, 0);
-    rb_define_method(ri, "local?", ri_is_local, 0);
-    rb_define_method(ri, "exist?", ri_exist, 0);
-    rb_define_method(ri, "==", ri_match, 1);
-
-    G_DEF_SETTERS(ri);   
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_INFO, "RecentInfo", mGtk);
+    RG_DEF_METHOD(uri, 0);
+    RG_DEF_METHOD(display_name, 0);
+    RG_DEF_METHOD(description, 0);
+    RG_DEF_METHOD(mime_type, 0);
+    RG_DEF_METHOD(added, 0);
+    RG_DEF_METHOD(modified, 0);
+    RG_DEF_METHOD(visited, 0);
+    RG_DEF_METHOD_P(private_hint, 0);
+    RG_DEF_METHOD(application_info, 1);
+    RG_DEF_METHOD(applications, 0);
+    RG_DEF_METHOD(last_application, 0);
+    RG_DEF_METHOD(groups, 0);
+    RG_DEF_METHOD_P(has_group, 1);
+    RG_DEF_METHOD_P(has_application, 1);
+    RG_DEF_METHOD(get_icon, 1);
+    RG_DEF_METHOD(short_name, 0);
+    RG_DEF_METHOD(uri_display, 0);
+    RG_DEF_METHOD(age, 0);
+    RG_DEF_METHOD_P(local, 0);
+    RG_DEF_METHOD_P(exist, 0);
+    RG_DEF_METHOD_OPERATOR("==", ri_match, 1);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);   
 #endif
 }

data/ext/gtk2/rbgtkrecentmanager.c

@@ -1,49 +1,59 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkrecentmanager.c -
-
-  $Author: mutoh $
-  $Date: 2006/11/12 15:28:40 $
-
-  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 "global.h"
 
 #if GTK_CHECK_VERSION(2,10,0)
 
+#define RG_TARGET_NAMESPACE cRecentManager
 #define _SELF(self) (GTK_RECENT_MANAGER(RVAL2GOBJ(self)))
 
-
 static VALUE
-rm_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_recent_manager_new());
     return Qnil;
 }
 
 static VALUE
-rm_s_get_default(VALUE self)
+rg_s_default(G_GNUC_UNUSED VALUE self)
 {
     return GOBJ2RVAL(gtk_recent_manager_get_default());
 }
 
 static VALUE
-rm_s_get_for_screen(VALUE self, VALUE screen)
+rg_s_get_for_screen(G_GNUC_UNUSED VALUE self, VALUE screen)
 {
     return GOBJ2RVAL(gtk_recent_manager_get_for_screen(GDK_SCREEN(RVAL2GOBJ(screen))));
 }
 
 static VALUE
-rm_set_screen(VALUE self, VALUE screen)
+rg_set_screen(VALUE self, VALUE screen)
 {
     gtk_recent_manager_set_screen(_SELF(self), GDK_SCREEN(RVAL2GOBJ(screen)));
     return self;
 }
 
 static VALUE
-rm_add_item(int argc, VALUE *argv, VALUE self)
+rg_add_item(int argc, VALUE *argv, VALUE self)
 {
     VALUE uri, data;
     gboolean ret;
@@ -62,18 +72,18 @@ rm_add_item(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-rm_remove_item(VALUE self, VALUE uri)
+rg_remove_item(VALUE self, VALUE uri)
 {
     GError* error = NULL;
     gboolean ret = gtk_recent_manager_remove_item(_SELF(self), RVAL2CSTR(uri),
                                                   &error);
     if (! ret) RAISE_GERROR(error);
-    
+
     return self;
 }
 
 static VALUE
-rm_lookup_item(VALUE self, VALUE uri)
+rg_lookup_item(VALUE self, VALUE uri)
 {
     GError* error = NULL;
     GtkRecentInfo* info = gtk_recent_manager_lookup_item(_SELF(self), RVAL2CSTR(uri),
@@ -83,13 +93,13 @@ rm_lookup_item(VALUE self, VALUE uri)
 }
 
 static VALUE
-rm_has_item(VALUE self, VALUE uri)
+rg_has_item_p(VALUE self, VALUE uri)
 {
     return CBOOL2RVAL(gtk_recent_manager_has_item(_SELF(self), RVAL2CSTR(uri)));
 }
 
 static VALUE
-rm_move_item(VALUE self, VALUE uri, VALUE new_uri)
+rg_move_item(VALUE self, VALUE uri, VALUE new_uri)
 {
     GError* error = NULL;
     gboolean ret = gtk_recent_manager_move_item(_SELF(self),
@@ -100,20 +110,14 @@ rm_move_item(VALUE self, VALUE uri, VALUE new_uri)
     return self;
 }
 
-/* Defined as properties
-gint        gtk_recent_manager_get_limit    (GtkRecentManager *manager);
-void        gtk_recent_manager_set_limit    (GtkRecentManager *manager,
-                                             gint limit);
-*/
-
 static VALUE
-rm_get_items(VALUE self)
+rg_items(VALUE self)
 {
     return GLIST2ARY2F(gtk_recent_manager_get_items(_SELF(self)), GTK_TYPE_RECENT_INFO);
 }
 
 static VALUE
-rm_purge_items(VALUE self)
+rg_purge_items(VALUE self)
 {
     GError* error = NULL;
     gint ret = gtk_recent_manager_purge_items(_SELF(self), &error);
@@ -125,23 +129,23 @@ rm_purge_items(VALUE self)
 #endif
 
 void 
-Init_gtk_recent_manager()
+Init_gtk_recent_manager(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE rm = G_DEF_CLASS(GTK_TYPE_RECENT_MANAGER, "RecentManager", mGtk);
-
-    rb_define_method(rm, "initialize", rm_initialize, 0);
-    rb_define_singleton_method(rm, "default", rm_s_get_default, 0);
-    rb_define_singleton_method(rm, "get_for_screen", rm_s_get_for_screen, 1);
-    rb_define_method(rm, "set_screen", rm_set_screen, 1);
-    G_DEF_SETTER(rm, "set_screen");
-    rb_define_method(rm, "add_item", rm_add_item, -1);
-    rb_define_method(rm, "remove_item", rm_remove_item, 1);
-    rb_define_method(rm, "lookup_item", rm_lookup_item, 1);
-    rb_define_method(rm, "has_item?", rm_has_item, 1);
-    rb_define_method(rm, "move_item", rm_move_item, 2);
-    rb_define_method(rm, "items", rm_get_items, 0);
-    rb_define_method(rm, "purge_items", rm_purge_items, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_MANAGER, "RecentManager", mGtk);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_SMETHOD(default, 0);
+    RG_DEF_SMETHOD(get_for_screen, 1);
+    RG_DEF_METHOD(set_screen, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "set_screen");
+    RG_DEF_METHOD(add_item, -1);
+    RG_DEF_METHOD(remove_item, 1);
+    RG_DEF_METHOD(lookup_item, 1);
+    RG_DEF_METHOD_P(has_item, 1);
+    RG_DEF_METHOD(move_item, 2);
+    RG_DEF_METHOD(items, 0);
+    RG_DEF_METHOD(purge_items, 0);
 
     /* GtkRecentManagerError */
     G_DEF_ERROR(GTK_RECENT_MANAGER_ERROR, "RecentManagerError", mGtk, rb_eRuntimeError,

data/ext/gtk2/rbgtkruler.c

@@ -1,37 +1,42 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkruler.c -
-
-  $Author: mutoh $
-  $Date: 2003/08/31 15:29:44 $
-
-  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 cRuler
 #define _SELF(self) (GTK_RULER(RVAL2GOBJ(self)))
 
-/* Defined as Properties
-void                gtk_ruler_set_metric                (GtkRuler *ruler,
-                                                         GtkMetricType metric);
-GtkMetricType       gtk_ruler_get_metric                (GtkRuler *ruler);
-*/
-
 static VALUE
-ruler_set_range(VALUE self, VALUE lower, VALUE upper, VALUE position, VALUE max_size)
+rg_set_range(VALUE self, VALUE lower, VALUE upper, VALUE position, VALUE max_size)
 {
     gtk_ruler_set_range(_SELF(self), NUM2DBL(lower), NUM2DBL(upper),
-			NUM2DBL(position), NUM2DBL(max_size));
+                        NUM2DBL(position), NUM2DBL(max_size));
     return self;
 }
 
 static VALUE
-ruler_get_range(VALUE self)
+rg_range(VALUE self)
 {
     gdouble lower, upper, position, max_size;
     gtk_ruler_get_range(_SELF(self), &lower, &upper, &position, &max_size);
@@ -40,27 +45,27 @@ ruler_get_range(VALUE self)
 }
 
 static VALUE
-ruler_draw_ticks(VALUE self)
+rg_draw_ticks(VALUE self)
 {
     gtk_ruler_draw_ticks(_SELF(self));
     return self;
 }
 
 static VALUE
-ruler_draw_pos(VALUE self)
+rg_draw_pos(VALUE self)
 {
     gtk_ruler_draw_pos(_SELF(self));
     return self;
 }
 
 void 
-Init_gtk_ruler()
+Init_gtk_ruler(VALUE mGtk)
 {
-    VALUE gRuler = G_DEF_CLASS(GTK_TYPE_RULER, "Ruler", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RULER, "Ruler", mGtk);
 
-    rb_define_method(gRuler, "set_range", ruler_set_range, 4);
-    G_DEF_SETTER(gRuler, "range");
-    rb_define_method(gRuler, "range", ruler_get_range, 0);
-    rb_define_method(gRuler, "draw_ticks", ruler_draw_ticks, 0);
-    rb_define_method(gRuler, "draw_pos", ruler_draw_pos, 0);
+    RG_DEF_METHOD(set_range, 4);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "range");
+    RG_DEF_METHOD(range, 0);
+    RG_DEF_METHOD(draw_ticks, 0);
+    RG_DEF_METHOD(draw_pos, 0);
 }