glib2 0.90.7 → 0.90.8

data/ext/glib2/rbglib_keyfile.c

@@ -42,26 +42,21 @@ g_key_file_get_type(void)
 #define _SELF(self) ((GKeyFile*)(RVAL2BOXED(self, G_TYPE_KEY_FILE)))
 
 static VALUE
-keyfile_initialize(self)
-    VALUE self;
+keyfile_initialize(VALUE self)
 {
     G_INITIALIZE(self, g_key_file_new());
     return Qnil;
 }
 
 static VALUE
-keyfile_set_list_separator(self, sep)
-    VALUE self, sep;
+keyfile_set_list_separator(VALUE self, VALUE sep)
 {
     g_key_file_set_list_separator(_SELF(self), NUM2INT(sep));
     return self;
 }
 
 static VALUE
-keyfile_load_from_file(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+keyfile_load_from_file(int argc, VALUE *argv, VALUE self)
 {
     VALUE file, flags;
     GError* error = NULL;
@@ -84,10 +79,7 @@ keyfile_load_from_file(argc, argv, self)
 }
 
 static VALUE
-keyfile_load_from_data(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+keyfile_load_from_data(int argc, VALUE *argv, VALUE self)
 {
     VALUE data, flags;
     GError* error = NULL;
@@ -112,10 +104,7 @@ keyfile_load_from_data(argc, argv, self)
 }
 
 static VALUE
-keyfile_load_from_data_dirs(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+keyfile_load_from_data_dirs(int argc, VALUE *argv, VALUE self)
 {
     VALUE file, flags;
     GError* error = NULL;
@@ -189,8 +178,7 @@ keyfile_load_from_dirs(int argc, VALUE *argv, VALUE self)
 #endif
 
 static VALUE
-keyfile_to_data(self)
-    VALUE self;
+keyfile_to_data(VALUE self)
 {
     GError* error = NULL;
     gchar* data = g_key_file_to_data(_SELF(self), NULL, &error);
@@ -201,15 +189,13 @@ keyfile_to_data(self)
 }
 
 static VALUE
-keyfile_get_start_group(self)
-    VALUE self;
+keyfile_get_start_group(VALUE self)
 {
     return CSTR2RVAL(g_key_file_get_start_group(_SELF(self)));
 }
 
 static VALUE
-keyfile_get_groups(self)
-    VALUE self;
+keyfile_get_groups(VALUE self)
 {
     gsize length;
     int i;
@@ -226,8 +212,7 @@ keyfile_get_groups(self)
 }
 
 static VALUE
-keyfile_get_keys(self, group_name)
-    VALUE self, group_name;
+keyfile_get_keys(VALUE self, VALUE group_name)
 {
     gsize length;
     int i;
@@ -249,16 +234,14 @@ keyfile_get_keys(self, group_name)
 }
 
 static VALUE
-keyfile_has_group(self, group_name)
-    VALUE self, group_name;
+keyfile_has_group(VALUE self, VALUE group_name)
 {
     return CBOOL2RVAL(g_key_file_has_group(_SELF(self), 
                                            (const gchar*)RVAL2CSTR(group_name)));
 }
 
 static VALUE
-keyfile_has_key(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_has_key(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
     gboolean ret = g_key_file_has_key(_SELF(self), 
@@ -272,8 +255,7 @@ keyfile_has_key(self, group_name, key)
 }
 
 static VALUE
-keyfile_get_value(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_get_value(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
     gchar* ret = g_key_file_get_value(_SELF(self), 
@@ -287,8 +269,7 @@ keyfile_get_value(self, group_name, key)
 }
 
 static VALUE
-keyfile_get_string(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_get_string(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
     gchar* ret = g_key_file_get_string(_SELF(self), 
@@ -302,10 +283,7 @@ keyfile_get_string(self, group_name, key)
 }
 
 static VALUE
-keyfile_get_locale_string(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+keyfile_get_locale_string(int argc, VALUE *argv, VALUE self)
 {
     VALUE group_name, key, locale;
     GError* error = NULL;
@@ -325,8 +303,7 @@ keyfile_get_locale_string(argc, argv, self)
 }
 
 static VALUE
-keyfile_get_boolean(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_get_boolean(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
     gboolean ret = g_key_file_get_boolean(_SELF(self), 
@@ -340,8 +317,7 @@ keyfile_get_boolean(self, group_name, key)
 }
 
 static VALUE
-keyfile_get_integer(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_get_integer(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
     gint ret = g_key_file_get_integer(_SELF(self), 
@@ -356,8 +332,7 @@ keyfile_get_integer(self, group_name, key)
 
 #if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
-keyfile_get_double(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_get_double(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
     gdouble ret = g_key_file_get_double(_SELF(self), 
@@ -372,8 +347,7 @@ keyfile_get_double(self, group_name, key)
 #endif
 
 static VALUE
-keyfile_get_string_list(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_get_string_list(VALUE self, VALUE group_name, VALUE key)
 {
     VALUE ary;
     gint i;
@@ -396,10 +370,7 @@ keyfile_get_string_list(self, group_name, key)
 }
 
 static VALUE
-keyfile_get_locale_string_list(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+keyfile_get_locale_string_list(int argc, VALUE *argv, VALUE self)
 {
     VALUE group_name, key, locale;
     GError* error = NULL;
@@ -428,8 +399,7 @@ keyfile_get_locale_string_list(argc, argv, self)
 }
 
 static VALUE
-keyfile_get_boolean_list(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_get_boolean_list(VALUE self, VALUE group_name, VALUE key)
 {
     VALUE ary;
     gint i;
@@ -450,8 +420,7 @@ keyfile_get_boolean_list(self, group_name, key)
 }
 
 static VALUE
-keyfile_get_integer_list(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_get_integer_list(VALUE self, VALUE group_name, VALUE key)
 {
     VALUE ary;
     gint i;
@@ -473,8 +442,7 @@ keyfile_get_integer_list(self, group_name, key)
 
 #if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
-keyfile_get_double_list(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_get_double_list(VALUE self, VALUE group_name, VALUE key)
 {
     VALUE ary;
     gint i;
@@ -496,8 +464,7 @@ keyfile_get_double_list(self, group_name, key)
 #endif
 
 static VALUE
-keyfile_get_comment(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_get_comment(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
     gchar* ret = g_key_file_get_comment(_SELF(self), 
@@ -511,8 +478,7 @@ keyfile_get_comment(self, group_name, key)
 }
 
 static VALUE
-keyfile_set_value(self, group_name, key, value)
-    VALUE self, group_name, key, value;
+keyfile_set_value(VALUE self, VALUE group_name, VALUE key, VALUE value)
 {
     g_key_file_set_value(_SELF(self), (const gchar*)RVAL2CSTR(group_name),
                          (const gchar*)RVAL2CSTR(key),
@@ -521,8 +487,7 @@ keyfile_set_value(self, group_name, key, value)
 }
 
 static VALUE
-keyfile_set_string(self, group_name, key, string)
-    VALUE self, group_name, key, string;
+keyfile_set_string(VALUE self, VALUE group_name, VALUE key, VALUE string)
 {
     g_key_file_set_string(_SELF(self), (const gchar*)RVAL2CSTR(group_name),
                          (const gchar*)RVAL2CSTR(key),
@@ -531,8 +496,7 @@ keyfile_set_string(self, group_name, key, string)
 }
 
 static VALUE
-keyfile_set_locale_string(self, group_name, key, locale, locale_string)
-    VALUE self, group_name, key, locale, locale_string;
+keyfile_set_locale_string(VALUE self, VALUE group_name, VALUE key, VALUE locale, VALUE locale_string)
 {
     g_key_file_set_locale_string(_SELF(self), (const gchar*)RVAL2CSTR(group_name),
                                  (const gchar*)RVAL2CSTR(key),
@@ -542,8 +506,7 @@ keyfile_set_locale_string(self, group_name, key, locale, locale_string)
 }
 
 static VALUE
-keyfile_set_boolean(self, group_name, key, value)
-    VALUE self, group_name, key, value;
+keyfile_set_boolean(VALUE self, VALUE group_name, VALUE key, VALUE value)
 {
     g_key_file_set_boolean(_SELF(self), (const gchar*)RVAL2CSTR(group_name),
                            (const gchar*)RVAL2CSTR(key),
@@ -552,8 +515,7 @@ keyfile_set_boolean(self, group_name, key, value)
 }
 
 static VALUE
-keyfile_set_integer(self, group_name, key, value)
-    VALUE self, group_name, key, value;
+keyfile_set_integer(VALUE self, VALUE group_name, VALUE key, VALUE value)
 {
     g_key_file_set_integer(_SELF(self), (const gchar*)RVAL2CSTR(group_name),
                            (const gchar*)RVAL2CSTR(key),
@@ -563,8 +525,7 @@ keyfile_set_integer(self, group_name, key, value)
 
 #if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
-keyfile_set_double(self, group_name, key, value)
-    VALUE self, group_name, key, value;
+keyfile_set_double(VALUE self, VALUE group_name, VALUE key, VALUE value)
 {
     g_key_file_set_double(_SELF(self), (const gchar*)RVAL2CSTR(group_name),
                           (const gchar*)RVAL2CSTR(key),
@@ -574,8 +535,7 @@ keyfile_set_double(self, group_name, key, value)
 #endif
 
 static VALUE
-keyfile_set_string_list(self, group_name, key, list)
-    VALUE self, group_name, key, list;
+keyfile_set_string_list(VALUE self, VALUE group_name, VALUE key, VALUE list)
 {
     gint len = RARRAY_LEN(list);
     gchar** glist = ALLOCA_N(gchar*, len);
@@ -593,8 +553,7 @@ keyfile_set_string_list(self, group_name, key, list)
 }
 
 static VALUE
-keyfile_set_locale_string_list(self, group_name, key, locale, list)
-    VALUE self, group_name, key, locale, list;
+keyfile_set_locale_string_list(VALUE self, VALUE group_name, VALUE key, VALUE locale, VALUE list)
 {
     gint len = RARRAY_LEN(list);
     gchar** glist = ALLOCA_N(gchar*, len);
@@ -613,8 +572,7 @@ keyfile_set_locale_string_list(self, group_name, key, locale, list)
 }
 
 static VALUE
-keyfile_set_boolean_list(self, group_name, key, list)
-    VALUE self, group_name, key, list;
+keyfile_set_boolean_list(VALUE self, VALUE group_name, VALUE key, VALUE list)
 {
     gint len = RARRAY_LEN(list);
     gboolean* glist = ALLOCA_N(gboolean, len);
@@ -632,8 +590,7 @@ keyfile_set_boolean_list(self, group_name, key, list)
 }
 
 static VALUE
-keyfile_set_integer_list(self, group_name, key, list)
-    VALUE self, group_name, key, list;
+keyfile_set_integer_list(VALUE self, VALUE group_name, VALUE key, VALUE list)
 {
     gint len = RARRAY_LEN(list);
     gint* glist = ALLOCA_N(gint, len);
@@ -652,8 +609,7 @@ keyfile_set_integer_list(self, group_name, key, list)
 
 #if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
-keyfile_set_double_list(self, group_name, key, list)
-    VALUE self, group_name, key, list;
+keyfile_set_double_list(VALUE self, VALUE group_name, VALUE key, VALUE list)
 {
     gint len = RARRAY_LEN(list);
     gdouble* glist = ALLOCA_N(gdouble, len);
@@ -672,8 +628,7 @@ keyfile_set_double_list(self, group_name, key, list)
 #endif
 
 static VALUE
-keyfile_set_comment(self, group_name, key, comment)
-    VALUE self, group_name, key, comment;
+keyfile_set_comment(VALUE self, VALUE group_name, VALUE key, VALUE comment)
 {
     GError* error = NULL;
     g_key_file_set_comment(_SELF(self), (const gchar*)RVAL2CSTR(group_name),
@@ -686,8 +641,7 @@ keyfile_set_comment(self, group_name, key, comment)
 }
 
 static VALUE
-keyfile_remove_group(self, group_name)
-    VALUE self, group_name;
+keyfile_remove_group(VALUE self, VALUE group_name)
 {
     GError* error = NULL;
     g_key_file_remove_group(_SELF(self), (const gchar*)RVAL2CSTR(group_name), &error);
@@ -698,8 +652,7 @@ keyfile_remove_group(self, group_name)
 }
 
 static VALUE
-keyfile_remove_key(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_remove_key(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
     g_key_file_remove_key(_SELF(self), 
@@ -714,8 +667,7 @@ keyfile_remove_key(self, group_name, key)
 
 
 static VALUE
-keyfile_remove_comment(self, group_name, key)
-    VALUE self, group_name, key;
+keyfile_remove_comment(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
     g_key_file_remove_comment(_SELF(self), 

data/ext/glib2/rbglib_maincontext.c

@@ -393,8 +393,7 @@ ruby_source_set_priority (VALUE self, VALUE priority)
 #endif
 
 static VALUE
-source_remove(self, tag)
-    VALUE self, tag;
+source_remove(VALUE self, VALUE tag)
 {
     VALUE callback;
     callback = G_GET_RELATIVE(mGLibSource, id__callbacks__, tag);
@@ -405,16 +404,14 @@ source_remove(self, tag)
 
 #if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
-source_current_source(self)
-    VALUE self;
+source_current_source(VALUE self)
 {
     return BOXED2RVAL(g_main_current_source, G_TYPE_SOURCE);
 }
 #endif
 
 static gboolean
-invoke_source_func(data)
-    gpointer data;
+invoke_source_func(gpointer data)
 {
     callback_info_t *info = (callback_info_t *)data;
     gboolean ret;
@@ -442,8 +439,7 @@ g_main_context_get_type(void)
 #define _SELF(s) ((GMainContext*)RVAL2BOXED(s, G_TYPE_MAIN_CONTEXT))
 
 static VALUE
-mc_initialize(self)
-    VALUE self;
+mc_initialize(VALUE self)
 {
     GMainContext *context;
 
@@ -464,29 +460,25 @@ mc_initialize(self)
 }
 
 static VALUE
-mc_s_default(self)
-    VALUE self;
+mc_s_default(VALUE self)
 {
     return BOXED2RVAL(g_main_context_default(), G_TYPE_MAIN_CONTEXT);
 }
 
 static VALUE
-mc_iteration(self, may_block)
-    VALUE self, may_block;
+mc_iteration(VALUE self, VALUE may_block)
 {
     return CBOOL2RVAL(g_main_context_iteration(_SELF(self), RVAL2CBOOL(may_block)));
 }
 
 static VALUE
-mc_pending(self)
-    VALUE self;
+mc_pending(VALUE self)
 {
     return CBOOL2RVAL(g_main_context_pending(_SELF(self)));
 }
 
 static VALUE
-mc_find_source(self, source_id)
-    VALUE self, source_id;
+mc_find_source(VALUE self, VALUE source_id)
 {
     GSource* src = g_main_context_find_source_by_id(_SELF(self), NUM2UINT(source_id));
     return BOXED2RVAL(src, G_TYPE_SOURCE);
@@ -503,23 +495,20 @@ GSource*    g_main_context_find_source_by_funcs_user_data
 */
 
 static VALUE
-mc_wakeup(self)
-    VALUE self;
+mc_wakeup(VALUE self)
 {
     g_main_context_wakeup(_SELF(self));
     return self;
 }
 
 static VALUE
-mc_acquire(self)
-    VALUE self;
+mc_acquire(VALUE self)
 {
     return CBOOL2RVAL(g_main_context_acquire(_SELF(self)));
 }
 
 static VALUE
-mc_release(self)
-    VALUE self;
+mc_release(VALUE self)
 {
     g_main_context_release(_SELF(self));
     return self;
@@ -527,8 +516,7 @@ mc_release(self)
 
 #if GLIB_CHECK_VERSION(2,10,0)
 static VALUE
-mc_is_owner(self)
-    VALUE self;
+mc_is_owner(VALUE self)
 {
     return CBOOL2RVAL(g_main_context_is_owner(_SELF(self)));
 }
@@ -541,8 +529,7 @@ gboolean    g_main_context_wait             (GMainContext *context,
 */
 
 static VALUE
-mc_prepare(self)
-    VALUE self;
+mc_prepare(VALUE self)
 {
     gint priority;
     gboolean ret = g_main_context_prepare(_SELF(self), &priority);
@@ -551,8 +538,7 @@ mc_prepare(self)
 }
 
 static VALUE
-mc_query(self, max_priority)
-    VALUE self, max_priority;
+mc_query(VALUE self, VALUE max_priority)
 {
     gint i, timeout_;
     VALUE ary;
@@ -577,8 +563,7 @@ mc_query(self, max_priority)
 
 /* How can I implement this?
 static VALUE
-mc_check(self, max_priority)
-    VALUE self, max_priority;
+mc_check(VALUE self, VALUE max_priority)
 {
     gint i, timeout_;
     VALUE ary;
@@ -607,8 +592,7 @@ mc_check(self, max_priority)
 */
 
 static VALUE
-mc_dispatch(self)
-    VALUE self;
+mc_dispatch(VALUE self)
 {
     g_main_context_dispatch(_SELF(self));
     return self;
@@ -616,10 +600,7 @@ mc_dispatch(self)
 
 /* How can I get "self" or something like it as key .... 
 static gint
-poll_func(ufds, nfsd, timeout_)
-    GPollFD* ufds;
-    guint nfsd;
-    gint timeout_;
+poll_func(GPollFD *ufds, guint nfsd, gint timeout_)
 {
     VALUE func = rb_ivar_get(self, id_poll_func);
     if NIL_P(func) return -1;
@@ -629,8 +610,7 @@ poll_func(ufds, nfsd, timeout_)
 }
 
 static VALUE
-mc_set_poll_func(self)
-    VALUE self;
+mc_set_poll_func(VALUE self)
 {
     rb_ivar_set(self, id_poll_func, rb_block_proc());
     g_main_context_set_poll_func(_SELF(self), (GPollFunc)poll_func);
@@ -644,8 +624,7 @@ GPollFunc   g_main_context_get_poll_func    (GMainContext *context);
 */
 
 static VALUE
-mc_add_poll(self, fd, priority)
-    VALUE self, fd, priority;
+mc_add_poll(VALUE self, VALUE fd, VALUE priority)
 {
     g_main_context_add_poll(_SELF(self), RVAL2BOXED(fd, G_TYPE_POLL_FD),
                             NUM2INT(priority));
@@ -653,8 +632,7 @@ mc_add_poll(self, fd, priority)
 }
 
 static VALUE
-mc_remove_poll(self, fd)
-    VALUE self, fd;
+mc_remove_poll(VALUE self, VALUE fd)
 {
     g_main_context_remove_poll(_SELF(self), RVAL2BOXED(fd, G_TYPE_POLL_FD));
     return self;
@@ -662,8 +640,7 @@ mc_remove_poll(self, fd)
 
 #ifdef HAVE_G_MAIN_DEPTH
 static VALUE
-mc_s_depth(self)
-    VALUE self;
+mc_s_depth(VALUE self)
 {
     return INT2NUM(g_main_depth());
 }
@@ -671,15 +648,13 @@ mc_s_depth(self)
 
 
 static VALUE
-timeout_source_new(self, interval)
-    VALUE self, interval;
+timeout_source_new(VALUE self, VALUE interval)
 {
     return BOXED2RVAL(g_timeout_source_new(NUM2UINT(interval)), G_TYPE_SOURCE);
 }
 #if GLIB_CHECK_VERSION(2,14,0)
 static VALUE
-timeout_source_new_seconds(self, interval)
-    VALUE self, interval;
+timeout_source_new_seconds(VALUE self, VALUE interval)
 {
     return BOXED2RVAL(g_timeout_source_new_seconds(NUM2UINT(interval)), G_TYPE_SOURCE);
 }
@@ -736,17 +711,13 @@ timeout_add_seconds(int argc, VALUE *argv, VALUE self)
 #endif
 
 static VALUE
-idle_source_new(self)
-    VALUE self;
+idle_source_new(VALUE self)
 {
     return BOXED2RVAL(g_idle_source_new(), G_TYPE_SOURCE);
 }
 
 static VALUE
-idle_add(argc, argv, self)
-    gint argc;
-    VALUE* argv;
-    VALUE self;
+idle_add(gint argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, func, rb_id;
     callback_info_t *info;
@@ -776,8 +747,7 @@ idle_add(argc, argv, self)
 }
 
 static VALUE
-idle_remove(self, func)
-    VALUE self, func;
+idle_remove(VALUE self, VALUE func)
 {
     callback_info_t *info;
 
@@ -789,24 +759,19 @@ idle_remove(self, func)
 
 #if GLIB_CHECK_VERSION(2,4,0)
 static VALUE
-child_watch_source_new(self, pid)
-    VALUE self, pid;
+child_watch_source_new(VALUE self, VALUE pid)
 {
     return BOXED2RVAL(g_child_watch_source_new((GPid)NUM2INT(pid)), G_TYPE_SOURCE);
 }
 
 static void
-child_watch_func(pid, status, func)
-    GPid pid;
-    gint status;
-    gpointer func;
+child_watch_func(GPid pid, gint status, gpointer func)
 {
     rb_funcall((VALUE)func, id_call, 2, INT2NUM((long)pid), INT2NUM(status));
 }
 
 static VALUE
-child_watch_add(self, pid)
-    VALUE self, pid;
+child_watch_add(VALUE self, VALUE pid)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);