gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkrecentdata.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkrecentdata.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"
 
@@ -45,10 +55,11 @@ gtk_recent_data_get_type(void)
 }
 /*****************************************/
 
+#define RG_TARGET_NAMESPACE cRecentData
 #define _SELF(w) ((GtkRecentData*)RVAL2BOXED(w, GTK_TYPE_RECENT_DATA))
 
 static VALUE
-rd_initialize(VALUE self)
+rg_initialize(VALUE self)
 {   
     GtkRecentData data;
     G_INITIALIZE(self, &data);
@@ -75,11 +86,11 @@ RD_STR(app_name);
 RD_STR(app_exec);
 
 static VALUE
-rd_get_groups(VALUE self)
+rg_groups(VALUE self)
 {
     gchar** grps = _SELF(self)->groups;
     VALUE ary = rb_ary_new();
- 
+
     gint i = 0;
     while (grps[i]) {
         rb_ary_push(ary, CSTR2RVAL((gchar*)grps[i]));
@@ -89,7 +100,7 @@ rd_get_groups(VALUE self)
 }
 
 static VALUE
-rd_set_groups(VALUE self, VALUE groups)
+rg_set_groups(VALUE self, VALUE groups)
 {
     _SELF(self)->groups = RVAL2STRV_DUP(groups);
 
@@ -97,13 +108,13 @@ rd_set_groups(VALUE self, VALUE groups)
 }
 
 static VALUE
-rd_get_is_private(VALUE self)
+rg_private_p(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->is_private);
 }
 
 static VALUE
-rd_set_is_private(VALUE self, VALUE is_private)
+rg_set_private(VALUE self, VALUE is_private)
 {
     _SELF(self)->is_private = RVAL2CBOOL(is_private);
     return self;
@@ -111,28 +122,28 @@ rd_set_is_private(VALUE self, VALUE is_private)
 
 #endif
 
-void 
-Init_gtk_recent_data() 
+void
+Init_gtk_recent_data(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE rd = G_DEF_CLASS(GTK_TYPE_RECENT_DATA, "RecentData", mGtk);
-
-    rb_define_method(rd, "initialize", rd_initialize, 0);
-    rb_define_method(rd, "display_name", rd_get_display_name, 0);
-    rb_define_method(rd, "set_display_name", rd_set_display_name, 1);
-    rb_define_method(rd, "description", rd_get_description, 0);
-    rb_define_method(rd, "set_description", rd_set_description, 1);
-    rb_define_method(rd, "mime_type", rd_get_mime_type, 0);
-    rb_define_method(rd, "set_mime_type", rd_set_mime_type, 1);
-    rb_define_method(rd, "app_name", rd_get_app_name, 0);
-    rb_define_method(rd, "set_app_name", rd_set_app_name, 1);
-    rb_define_method(rd, "app_exec", rd_get_app_exec, 0);
-    rb_define_method(rd, "set_app_exec", rd_set_app_exec, 1);
-    rb_define_method(rd, "groups", rd_get_groups, 0);
-    rb_define_method(rd, "set_groups", rd_set_groups, 1);
-    rb_define_method(rd, "private?", rd_get_is_private, 0);
-    rb_define_method(rd, "set_private", rd_set_is_private, 1);
-
-    G_DEF_SETTERS(rd);   
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_DATA, "RecentData", mGtk);
+
+    RG_DEF_METHOD(initialize, 0);
+    rb_define_method(RG_TARGET_NAMESPACE, "display_name", rd_get_display_name, 0);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_display_name", rd_set_display_name, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "description", rd_get_description, 0);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_description", rd_set_description, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "mime_type", rd_get_mime_type, 0);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_mime_type", rd_set_mime_type, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "app_name", rd_get_app_name, 0);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_app_name", rd_set_app_name, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "app_exec", rd_get_app_exec, 0);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_app_exec", rd_set_app_exec, 1);
+    RG_DEF_METHOD(groups, 0);
+    RG_DEF_METHOD(set_groups, 1);
+    RG_DEF_METHOD_P(private, 0);
+    RG_DEF_METHOD(set_private, 1);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);   
 #endif
 }

data/ext/gtk2/rbgtkrecentfilter.c

@@ -1,83 +1,93 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkrecentfilter.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 03:00:49 $
-
-  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 cRecentFilter
 #define _SELF(self) (GTK_RECENT_FILTER(RVAL2GOBJ(self)))
 
 static VALUE
-rf_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
   RBGTK_INITIALIZE(self, gtk_recent_filter_new());
   return Qnil;
 }
 
 static VALUE
-rf_get_name(VALUE self)
+rg_name(VALUE self)
 {
   return CSTR2RVAL(gtk_recent_filter_get_name(_SELF(self)));
 }
 
 static VALUE
-rf_set_name(VALUE self, VALUE name)
+rg_set_name(VALUE self, VALUE name)
 {
   gtk_recent_filter_set_name(_SELF(self), RVAL2CSTR(name));
   return self;
 }
 
 static VALUE
-rf_add_mime_type(VALUE self, VALUE mime_type)
+rg_add_mime_type(VALUE self, VALUE mime_type)
 {
   gtk_recent_filter_add_mime_type(_SELF(self), RVAL2CSTR(mime_type));
   return self;
 }
 
 static VALUE
-rf_add_pattern(VALUE self, VALUE pattern)
+rg_add_pattern(VALUE self, VALUE pattern)
 {
   gtk_recent_filter_add_pattern(_SELF(self), RVAL2CSTR(pattern));
   return self;
 }
 
 static VALUE
-rf_add_pixbuf_formats(VALUE self)
+rg_add_pixbuf_formats(VALUE self)
 {
   gtk_recent_filter_add_pixbuf_formats(_SELF(self));
   return self;
 }
 
 static VALUE
-rf_add_application(VALUE self, VALUE application)
+rg_add_application(VALUE self, VALUE application)
 {
   gtk_recent_filter_add_application(_SELF(self), RVAL2CSTR(application));
   return self;
 }
 
 static VALUE
-rf_add_group(VALUE self, VALUE group)
+rg_add_group(VALUE self, VALUE group)
 {
   gtk_recent_filter_add_group(_SELF(self), RVAL2CSTR(group));
   return self;
 }
 
 static VALUE
-rf_add_age(VALUE self, VALUE days)
+rg_add_age(VALUE self, VALUE days)
 {
   gtk_recent_filter_add_age(_SELF(self), NUM2INT(days));
   return self;
 }
 
-
 struct callback_arg
 {
   VALUE callback;
@@ -99,7 +109,7 @@ filter_func(const GtkRecentFilterInfo *info, gpointer func)
 
     arg.callback = (VALUE)func;
     arg.info = BOXED2RVAL((gpointer)info, GTK_TYPE_RECENT_FILTER_INFO);
-  
+
     result = G_PROTECT_CALLBACK(invoke_callback, &arg);
     return NIL_P(rb_errinfo()) ? TRUE : RVAL2CBOOL(result);
 }
@@ -111,28 +121,27 @@ remove_callback_reference(gpointer data)
 }
 
 static VALUE
-rf_add_custom(VALUE self, VALUE needed)
+rg_add_custom(VALUE self, VALUE needed)
 {
   VALUE func = rb_block_proc();
   G_CHILD_ADD(mGtk, func);
 
   gtk_recent_filter_add_custom(_SELF(self),
-			       RVAL2GFLAGS(needed, GTK_TYPE_RECENT_FILTER_FLAGS),
-			       (GtkRecentFilterFunc)filter_func, 
-			       (gpointer)func, 
-			       (GDestroyNotify)remove_callback_reference);
+                               RVAL2GFLAGS(needed, GTK_TYPE_RECENT_FILTER_FLAGS),
+                               (GtkRecentFilterFunc)filter_func, 
+                               (gpointer)func, 
+                               (GDestroyNotify)remove_callback_reference);
   return self;
 }
 
 static VALUE
-rf_get_needed(VALUE self)
+rg_needed(VALUE self)
 {
   return GFLAGS2RVAL(gtk_recent_filter_get_needed(_SELF(self)), GTK_TYPE_RECENT_FILTER_FLAGS);
 }
 
-
 static VALUE
-rf_filter_filter(VALUE self, VALUE filter_info)
+rg_filter(VALUE self, VALUE filter_info)
 {
     return CBOOL2RVAL(gtk_recent_filter_filter(_SELF(self),
                                                (GtkRecentFilterInfo*)RVAL2BOXED(filter_info, GTK_TYPE_RECENT_FILTER_INFO)));
@@ -140,27 +149,27 @@ rf_filter_filter(VALUE self, VALUE filter_info)
 #endif
 
 void 
-Init_gtk_recent_filter()
+Init_gtk_recent_filter(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE rf = G_DEF_CLASS(GTK_TYPE_RECENT_FILTER, "RecentFilter", mGtk);
-    rb_define_method(rf, "initialize", rf_initialize, 0);
-    rb_define_method(rf, "name", rf_get_name, 0);
-    rb_define_method(rf, "set_name", rf_set_name, 1);
-    rb_define_method(rf, "add_mime_type", rf_add_mime_type, 1);
-    rb_define_method(rf, "add_pattern", rf_add_pattern, 1);
-    rb_define_method(rf, "add_pixbuf_formats", rf_add_pixbuf_formats, 0);
-    rb_define_method(rf, "add_application", rf_add_application, 1);
-    rb_define_method(rf, "add_group", rf_add_group, 1);
-    rb_define_method(rf, "add_age", rf_add_age, 1);
-    rb_define_method(rf, "add_custom", rf_add_custom, 1);
-    rb_define_method(rf, "needed", rf_get_needed, 0);
-    rb_define_method(rf, "filter", rf_filter_filter, 1);
-
-    G_DEF_SETTERS(rf);   
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_FILTER, "RecentFilter", mGtk);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(name, 0);
+    RG_DEF_METHOD(set_name, 1);
+    RG_DEF_METHOD(add_mime_type, 1);
+    RG_DEF_METHOD(add_pattern, 1);
+    RG_DEF_METHOD(add_pixbuf_formats, 0);
+    RG_DEF_METHOD(add_application, 1);
+    RG_DEF_METHOD(add_group, 1);
+    RG_DEF_METHOD(add_age, 1);
+    RG_DEF_METHOD(add_custom, 1);
+    RG_DEF_METHOD(needed, 0);
+    RG_DEF_METHOD(filter, 1);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);   
 
     /* GtkRecentFilterFlags */
-    G_DEF_CLASS(GTK_TYPE_RECENT_FILTER_FLAGS, "Flags", rf);
-    G_DEF_CONSTANTS(rf, GTK_TYPE_RECENT_FILTER_FLAGS, "GTK_RECENT_FILTER_");
+    G_DEF_CLASS(GTK_TYPE_RECENT_FILTER_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_RECENT_FILTER_FLAGS, "GTK_RECENT_FILTER_");
 #endif
 }

data/ext/gtk2/rbgtkrecentfilterinfo.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkrecentfilterinfo.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"
 
@@ -46,10 +56,11 @@ gtk_recent_filter_info_get_type(void)
 }
 /*****************************************/
 
+#define RG_TARGET_NAMESPACE cRecentFilterInfo
 #define _SELF(w) ((GtkRecentFilterInfo*)RVAL2BOXED(w, GTK_TYPE_RECENT_FILTER_INFO))
 
 static VALUE
-rf_initialize(VALUE self)
+rg_initialize(VALUE self)
 {   
     GtkRecentFilterInfo finfo;
     G_INITIALIZE(self, &finfo);
@@ -57,13 +68,13 @@ rf_initialize(VALUE self)
 }
 
 static VALUE
-rf_get_contains(VALUE self)
+rg_contains(VALUE self)
 {
     return GFLAGS2RVAL(_SELF(self)->contains, GTK_TYPE_RECENT_FILTER_FLAGS);
 }
 
 static VALUE
-rf_set_contains(VALUE self, VALUE contains)
+rg_set_contains(VALUE self, VALUE contains)
 {
     _SELF(self)->contains = RVAL2GFLAGS(contains, GTK_TYPE_RECENT_FILTER_FLAGS);
     return self;
@@ -87,7 +98,7 @@ FINFO_STR(display_name);
 FINFO_STR(mime_type);
 
 static VALUE
-rf_get_applications(VALUE self)
+rg_applications(VALUE self)
 {
     const gchar** apps = _SELF(self)->applications;
     VALUE ary = rb_ary_new();
@@ -101,9 +112,9 @@ rf_get_applications(VALUE self)
 }
 
 static VALUE
-rf_set_applications(VALUE self, VALUE applications)
+rg_set_applications(VALUE self, VALUE applications)
 {
-    /* NOTE: This can’t be right.  What guarantees that the entries in
+    /* NOTE: This can't be right.  What guarantees that the entries in
      * applications will be around?  It should be RVAL2STRV_DUP and use
      * g_strfreev in free above. */
     _SELF(self)->applications = RVAL2STRV(applications);
@@ -112,11 +123,11 @@ rf_set_applications(VALUE self, VALUE applications)
 }
 
 static VALUE
-rf_get_groups(VALUE self)
+rg_groups(VALUE self)
 {
     const gchar** grps = _SELF(self)->groups;
     VALUE ary = rb_ary_new();
- 
+
     gint i = 0;
     while (grps[i]) {
         rb_ary_push(ary, CSTR2RVAL((gchar*)grps[i]));
@@ -126,7 +137,7 @@ rf_get_groups(VALUE self)
 }
 
 static VALUE
-rf_set_groups(VALUE self, VALUE groups)
+rg_set_groups(VALUE self, VALUE groups)
 {
     _SELF(self)->groups = RVAL2STRV(groups);
 
@@ -134,13 +145,13 @@ rf_set_groups(VALUE self, VALUE groups)
 }
 
 static VALUE
-rf_get_age(VALUE self)
+rg_age(VALUE self)
 {
     return INT2NUM(_SELF(self)->age);
 }
 
 static VALUE
-rf_set_age(VALUE self, VALUE age)
+rg_set_age(VALUE self, VALUE age)
 {
     _SELF(self)->age = NUM2INT(age);
     return self;
@@ -149,27 +160,27 @@ rf_set_age(VALUE self, VALUE age)
 #endif
 
 void 
-Init_gtk_recent_filter_info()
+Init_gtk_recent_filter_info(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE rf = G_DEF_CLASS(GTK_TYPE_RECENT_FILTER_INFO, "RecentFilterInfo", mGtk);
-
-    rb_define_method(rf, "initialize", rf_initialize, 0);
-    rb_define_method(rf, "contains", rf_get_contains, 0);
-    rb_define_method(rf, "set_contains", rf_set_contains, 1);
-    rb_define_method(rf, "uri", rf_get_uri, 0);
-    rb_define_method(rf, "set_uri", rf_set_uri, 1);
-    rb_define_method(rf, "display_name", rf_get_display_name, 0);
-    rb_define_method(rf, "set_display_name", rf_set_display_name, 1);
-    rb_define_method(rf, "mime_type", rf_get_mime_type, 0);
-    rb_define_method(rf, "set_mime_type", rf_set_mime_type, 1);
-    rb_define_method(rf, "applications", rf_get_applications, 0);
-    rb_define_method(rf, "set_applications", rf_set_applications, 1);
-    rb_define_method(rf, "groups", rf_get_groups, 0);
-    rb_define_method(rf, "set_groups", rf_set_groups, 1);
-    rb_define_method(rf, "age", rf_get_age, 0);
-    rb_define_method(rf, "set_age", rf_set_age, 1);
-
-    G_DEF_SETTERS(rf);   
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_FILTER_INFO, "RecentFilterInfo", mGtk);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(contains, 0);
+    RG_DEF_METHOD(set_contains, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "uri", rf_get_uri, 0);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_uri", rf_set_uri, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "display_name", rf_get_display_name, 0);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_display_name", rf_set_display_name, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "mime_type", rf_get_mime_type, 0);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_mime_type", rf_set_mime_type, 1);
+    RG_DEF_METHOD(applications, 0);
+    RG_DEF_METHOD(set_applications, 1);
+    RG_DEF_METHOD(groups, 0);
+    RG_DEF_METHOD(set_groups, 1);
+    RG_DEF_METHOD(age, 0);
+    RG_DEF_METHOD(set_age, 1);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);   
 #endif
 }