gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkrcstyle.c

@@ -14,31 +14,27 @@
 #define _SELF(rc) (GTK_RC_STYLE(RVAL2GOBJ(rc)))
 
 static VALUE
-rcstyle_initialize(self)
-    VALUE self;
+rcstyle_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_rc_style_new());
     return Qnil;
 }
 
 static VALUE
-rcstyle_name(self)
-    VALUE self;
+rcstyle_name(VALUE self)
 {
     return CSTR2RVAL(_SELF(self)->name);
 }
 
 static VALUE
-rcstyle_set_name(self, name)
-    VALUE self, name;
+rcstyle_set_name(VALUE self, VALUE name)
 {
     _SELF(self)->name = RVAL2CSTR(name);
     return self;
 }
 
 static VALUE
-rcstyle_bg_pixmap_name(self, idx)
-    VALUE self, idx;
+rcstyle_bg_pixmap_name(VALUE self, VALUE idx)
 {
     int i = NUM2INT(idx);
 
@@ -48,8 +44,7 @@ rcstyle_bg_pixmap_name(self, idx)
 }
 
 static VALUE
-rcstyle_set_bg_pixmap_name(self, idx, bg_pixmap_name)
-    VALUE self, idx, bg_pixmap_name;
+rcstyle_set_bg_pixmap_name(VALUE self, VALUE idx, VALUE bg_pixmap_name)
 {
     int i = NUM2INT(idx);
 
@@ -60,16 +55,14 @@ rcstyle_set_bg_pixmap_name(self, idx, bg_pixmap_name)
 }
     
 static VALUE
-rcstyle_font_desc(self)
-    VALUE self;
+rcstyle_font_desc(VALUE self)
 {
     PangoFontDescription* desc = _SELF(self)->font_desc;
     return BOXED2RVAL(desc, PANGO_TYPE_FONT_DESCRIPTION);
 }
 
 static VALUE
-rcstyle_set_font_desc(self, font_desc)
-    VALUE self, font_desc;
+rcstyle_set_font_desc(VALUE self, VALUE font_desc)
 {
     _SELF(self)->font_desc = (PangoFontDescription*)RVAL2BOXED(font_desc, PANGO_TYPE_FONT_DESCRIPTION);
     return self;
@@ -96,8 +89,7 @@ rcstyle_set_color_flags(VALUE self, VALUE rb_state_type, VALUE flags)
 
 #define DEFINE_STYLE_COLOR(type) \
 static VALUE \
-rcstyle_set_ ## type(self, idx, r, g, b) \
-    VALUE self, idx, r, g, b; \
+rcstyle_set_ ## type(VALUE self, VALUE idx, VALUE r, VALUE g, VALUE b) \
 { \
   GdkColor *color; \
   int i = NUM2INT(idx); \
@@ -110,8 +102,7 @@ rcstyle_set_ ## type(self, idx, r, g, b) \
   return self;\
 } \
 static VALUE \
-rcstyle_ ## type(self, idx) \
-    VALUE self, idx; \
+rcstyle_ ## type(VALUE self, VALUE idx) \
 { \
   int i = NUM2INT(idx); \
  \
@@ -125,30 +116,26 @@ DEFINE_STYLE_COLOR(text);
 DEFINE_STYLE_COLOR(base);
 
 static VALUE
-rcstyle_xthickness(self)
-    VALUE self;
+rcstyle_xthickness(VALUE self)
 {
     return INT2NUM(_SELF(self)->xthickness);
 }
 
 static VALUE
-rcstyle_set_xthickness(self, xthickness)
-    VALUE self, xthickness;
+rcstyle_set_xthickness(VALUE self, VALUE xthickness)
 {
     _SELF(self)->xthickness = NUM2INT(xthickness);
     return self;
 }
 
 static VALUE
-rcstyle_ythickness(self)
-    VALUE self;
+rcstyle_ythickness(VALUE self)
 {
     return INT2NUM(_SELF(self)->ythickness);
 }
 
 static VALUE
-rcstyle_set_ythickness(self, ythickness)
-    VALUE self, ythickness;
+rcstyle_set_ythickness(VALUE self, VALUE ythickness)
 {
     _SELF(self)->ythickness = NUM2INT(ythickness);
     return self;

data/ext/gtk2/rbgtkrecentaction.c

@@ -17,10 +17,7 @@
 #if GTK_CHECK_VERSION(2,12,0)
 
 static VALUE
-recentaction_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+recentaction_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE  name, label, tooltip, stock_id, manager;
     rb_scan_args(argc, argv, "23", &name, &label, &tooltip, &stock_id, &manager);

data/ext/gtk2/rbgtkrecentchooser.c

@@ -61,16 +61,14 @@ GtkRecentFilter* gtk_recent_chooser_get_filter
 
 */
 static VALUE
-rc_set_show_numbers(self, val)
-    VALUE self, val;
+rc_set_show_numbers(VALUE self, VALUE val)
 {
     gtk_recent_chooser_set_show_numbers(_SELF(self), RVAL2CBOOL(val));
     return self;
 }
 
 static VALUE
-rc_get_show_numbers(self)
-    VALUE self;
+rc_get_show_numbers(VALUE self)
 {
     return CBOOL2RVAL(gtk_recent_chooser_get_show_numbers(_SELF(self)));
 }
@@ -82,25 +80,20 @@ struct callback_arg
 };
 
 static VALUE
-invoke_callback(data)
-    VALUE data;
+invoke_callback(VALUE data)
 {
     struct callback_arg *arg = (struct callback_arg *)data;
     return rb_funcall(arg->callback, id_call, 1, arg->a, arg->b);
 }
 
 static void
-remove_callback_reference(callback)
-    gpointer callback;
+remove_callback_reference(gpointer callback)
 {
     G_CHILD_REMOVE(mGtk, (VALUE)callback);
 }
 
 static gint
-sort_func(a, b, func)
-    GtkRecentInfo* a;
-    GtkRecentInfo* b;
-    gpointer func;
+sort_func(GtkRecentInfo *a, GtkRecentInfo *b, gpointer func)
 {
     struct callback_arg arg;
 
@@ -111,8 +104,7 @@ sort_func(a, b, func)
 }
 
 static VALUE
-rc_set_sort_func(self)
-    VALUE self;
+rc_set_sort_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_CHILD_ADD(mGtk, func);
@@ -122,8 +114,7 @@ rc_set_sort_func(self)
 }
 
 static VALUE
-rc_set_current_uri(self, uri)
-    VALUE self, uri;
+rc_set_current_uri(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gboolean ret = gtk_recent_chooser_set_current_uri(_SELF(self),
@@ -134,23 +125,20 @@ rc_set_current_uri(self, uri)
 }
 
 static VALUE
-rc_get_current_uri(self)
-    VALUE self;
+rc_get_current_uri(VALUE self)
 {
     return CSTR2RVAL(gtk_recent_chooser_get_current_uri(_SELF(self)));
 }
 
 static VALUE
-rc_get_current_item(self)
-    VALUE self;
+rc_get_current_item(VALUE self)
 {
     return BOXED2RVAL(gtk_recent_chooser_get_current_item(_SELF(self)),
                       GTK_TYPE_RECENT_INFO);
 }
 
 static VALUE
-rc_select_uri(self, uri)
-    VALUE self, uri;
+rc_select_uri(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gboolean ret = gtk_recent_chooser_select_uri(_SELF(self),
@@ -161,32 +149,28 @@ rc_select_uri(self, uri)
 }
 
 static VALUE
-rc_unselect_uri(self, uri)
-    VALUE self, uri;
+rc_unselect_uri(VALUE self, VALUE uri)
 {
     gtk_recent_chooser_unselect_uri(_SELF(self), RVAL2CSTR(uri));
     return self;
 }
 
 static VALUE
-rc_select_all(self)
-    VALUE self;
+rc_select_all(VALUE self)
 {
     gtk_recent_chooser_select_all(_SELF(self));
     return self;
 }
 
 static VALUE
-rc_unselect_all(self)
-    VALUE self;
+rc_unselect_all(VALUE self)
 {
     gtk_recent_chooser_unselect_all(_SELF(self));
     return self;
 }
 
 static VALUE
-rc_get_items(self)
-    VALUE self;
+rc_get_items(VALUE self)
 {
     GList* list = gtk_recent_chooser_get_items(_SELF(self));
     VALUE ary = rb_ary_new();
@@ -200,8 +184,7 @@ rc_get_items(self)
 }
     
 static VALUE
-rc_get_uris(self)
-    VALUE self;
+rc_get_uris(VALUE self)
 {
     int i;
     gsize size;
@@ -215,8 +198,7 @@ rc_get_uris(self)
 }
 
 static VALUE
-rc_add_filter(self, filter)
-    VALUE self, filter;
+rc_add_filter(VALUE self, VALUE filter)
 {
     gtk_recent_chooser_add_filter(_SELF(self), 
                                   GTK_RECENT_FILTER(RVAL2GOBJ(filter)));
@@ -224,8 +206,7 @@ rc_add_filter(self, filter)
 }
 
 static VALUE
-rc_remove_filter(self, filter)
-    VALUE self, filter;
+rc_remove_filter(VALUE self, VALUE filter)
 {
     gtk_recent_chooser_remove_filter(_SELF(self),
                                      GTK_RECENT_FILTER(RVAL2GOBJ(filter)));
@@ -233,8 +214,7 @@ rc_remove_filter(self, filter)
 }
 
 static VALUE
-rc_list_filters(self)
-    VALUE self;
+rc_list_filters(VALUE self)
 {
     return GSLIST2ARYF(gtk_recent_chooser_list_filters(_SELF(self)));
 }

data/ext/gtk2/rbgtkrecentchooserdialog.c

@@ -16,10 +16,7 @@
 #define _SELF(self) (GTK_RECENT_CHOOSER_DIALOG(RVAL2GOBJ(self)))
 
 static VALUE
-rcd_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rcd_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE title, parent, button_ary;
     GtkWidget* dialog;

data/ext/gtk2/rbgtkrecentchoosermenu.c

@@ -16,10 +16,7 @@
 #define _SELF(self) (GTK_RECENT_CHOOSER_MENU(RVAL2GOBJ(self)))
 
 static VALUE
-rcm_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rcm_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE manager;
     GtkWidget* menu;

data/ext/gtk2/rbgtkrecentchooserwidget.c

@@ -16,10 +16,7 @@
 #define _SELF(self) (GTK_RECENT_CHOOSER_WIDGET(RVAL2GOBJ(self)))
 
 static VALUE
-rcw_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rcw_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE manager;
     GtkWidget* widget;

data/ext/gtk2/rbgtkrecentdata.c

@@ -48,8 +48,7 @@ gtk_recent_data_get_type(void)
 #define _SELF(w) ((GtkRecentData*)RVAL2BOXED(w, GTK_TYPE_RECENT_DATA))
 
 static VALUE
-rd_initialize(self)
-    VALUE self;
+rd_initialize(VALUE self)
 {   
     GtkRecentData data;
     G_INITIALIZE(self, &data);
@@ -58,14 +57,12 @@ rd_initialize(self)
 
 #define RD_STR(name)\
 static VALUE \
-rd_get_ ## name (self)\
-    VALUE self;\
+rd_get_ ## name (VALUE self)\
 {\
     return CSTR2RVAL(_SELF(self)->name);\
 }\
 static VALUE \
-rd_set_ ## name (self, val)\
-    VALUE self, val;\
+rd_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = RVAL2CSTR(val);\
     return self;\
@@ -78,8 +75,7 @@ RD_STR(app_name);
 RD_STR(app_exec);
 
 static VALUE
-rd_get_groups(self)
-    VALUE self;
+rd_get_groups(VALUE self)
 {
     gchar** grps = _SELF(self)->groups;
     VALUE ary = rb_ary_new();
@@ -93,8 +89,7 @@ rd_get_groups(self)
 }
 
 static VALUE
-rd_set_groups(self, groups)
-    VALUE self, groups;
+rd_set_groups(VALUE self, VALUE groups)
 {
     gint i;
     gint len = RARRAY_LEN(groups);
@@ -109,15 +104,13 @@ rd_set_groups(self, groups)
 }
 
 static VALUE
-rd_get_is_private(self)
-    VALUE self;
+rd_get_is_private(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->is_private);
 }
 
 static VALUE
-rd_set_is_private(self, is_private)
-    VALUE self, is_private;
+rd_set_is_private(VALUE self, VALUE is_private)
 {
     _SELF(self)->is_private = RVAL2CBOOL(is_private);
     return self;

data/ext/gtk2/rbgtkrecentfilter.c

@@ -16,71 +16,62 @@
 #define _SELF(self) (GTK_RECENT_FILTER(RVAL2GOBJ(self)))
 
 static VALUE
-rf_initialize(self)
-     VALUE self;
+rf_initialize(VALUE self)
 {
   RBGTK_INITIALIZE(self, gtk_recent_filter_new());
   return Qnil;
 }
 
 static VALUE
-rf_get_name(self)
-     VALUE self;
+rf_get_name(VALUE self)
 {
   return CSTR2RVAL(gtk_recent_filter_get_name(_SELF(self)));
 }
 
 static VALUE
-rf_set_name(self, name)
-     VALUE self, name;
+rf_set_name(VALUE self, VALUE name)
 {
   gtk_recent_filter_set_name(_SELF(self), RVAL2CSTR(name));
   return self;
 }
 
 static VALUE
-rf_add_mime_type(self, mime_type)
-     VALUE self, mime_type;
+rf_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(self, pattern)
-     VALUE self, pattern;
+rf_add_pattern(VALUE self, VALUE pattern)
 {
   gtk_recent_filter_add_pattern(_SELF(self), RVAL2CSTR(pattern));
   return self;
 }
 
 static VALUE
-rf_add_pixbuf_formats(self)
-     VALUE self;
+rf_add_pixbuf_formats(VALUE self)
 {
   gtk_recent_filter_add_pixbuf_formats(_SELF(self));
   return self;
 }
 
 static VALUE
-rf_add_application(self, application)
-     VALUE self, application;
+rf_add_application(VALUE self, VALUE application)
 {
   gtk_recent_filter_add_application(_SELF(self), RVAL2CSTR(application));
   return self;
 }
 
 static VALUE
-rf_add_group(self, group)
-     VALUE self, group;
+rf_add_group(VALUE self, VALUE group)
 {
   gtk_recent_filter_add_group(_SELF(self), RVAL2CSTR(group));
   return self;
 }
 
 static VALUE
-rf_add_age(self, days)
-     VALUE self, days;
+rf_add_age(VALUE self, VALUE days)
 {
   gtk_recent_filter_add_age(_SELF(self), NUM2INT(days));
   return self;
@@ -101,9 +92,7 @@ invoke_callback(VALUE arg_)
 }
 
 static gboolean
-filter_func(info, func)
-     const GtkRecentFilterInfo* info;
-     gpointer func;
+filter_func(const GtkRecentFilterInfo *info, gpointer func)
 {
     struct callback_arg arg;
 
@@ -115,15 +104,13 @@ filter_func(info, func)
 }
 
 static void
-remove_callback_reference(data)
-     gpointer data;
+remove_callback_reference(gpointer data)
 {
     G_CHILD_REMOVE(mGtk, (VALUE)data);
 }
 
 static VALUE
-rf_add_custom(self, needed)
-     VALUE self, needed;
+rf_add_custom(VALUE self, VALUE needed)
 {
   VALUE func = rb_block_proc();
   G_CHILD_ADD(mGtk, func);
@@ -137,16 +124,14 @@ rf_add_custom(self, needed)
 }
 
 static VALUE
-rf_get_needed(self)
-     VALUE self;
+rf_get_needed(VALUE self)
 {
   return GFLAGS2RVAL(gtk_recent_filter_get_needed(_SELF(self)), GTK_TYPE_RECENT_FILTER_FLAGS);
 }
 
 
 static VALUE
-rf_filter_filter(self, filter_info)
-    VALUE self, filter_info;
+rf_filter_filter(VALUE self, VALUE filter_info)
 {
     return CBOOL2RVAL(gtk_recent_filter_filter(_SELF(self),
                                                (GtkRecentFilterInfo*)RVAL2BOXED(filter_info, GTK_TYPE_RECENT_FILTER_INFO)));