glib2 1.1.2 → 1.1.3

data/ext/glib2/rbglib_ucs4.c

@@ -25,7 +25,7 @@
 #define RG_TARGET_NAMESPACE mUCS4
 
 static VALUE
-rg_m_to_utf16(G_GNUC_UNUSED VALUE self, VALUE rb_ucs4)
+rg_s_to_utf16(G_GNUC_UNUSED VALUE self, VALUE rb_ucs4)
 {
     VALUE result;
     gunichar *ucs4;
@@ -48,7 +48,7 @@ rg_m_to_utf16(G_GNUC_UNUSED VALUE self, VALUE rb_ucs4)
 }
 
 static VALUE
-rg_m_to_utf8(G_GNUC_UNUSED VALUE self, VALUE rb_ucs4)
+rg_s_to_utf8(G_GNUC_UNUSED VALUE self, VALUE rb_ucs4)
 {
     VALUE result;
     gunichar *ucs4;
@@ -74,6 +74,6 @@ Init_glib_ucs4(void)
 {
     VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "UCS4");
 
-    RG_DEF_MODFUNC(to_utf16, 1);
-    RG_DEF_MODFUNC(to_utf8, 1);
+    RG_DEF_SMETHOD(to_utf16, 1);
+    RG_DEF_SMETHOD(to_utf8, 1);
 }

data/ext/glib2/rbglib_unichar.c

@@ -52,44 +52,44 @@ DEF_IS_UNICHAR(wide_cjk)
 #undef DEF_IS_UNICHAR
 
 static VALUE
-rg_m_to_upper(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_to_upper(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return UINT2NUM(g_unichar_toupper(NUM2UINT(unichar)));
 }
 
 static VALUE
-rg_m_to_lower(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_to_lower(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return UINT2NUM(g_unichar_tolower(NUM2UINT(unichar)));
 }
 
 static VALUE
-rg_m_to_title(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_to_title(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return UINT2NUM(g_unichar_totitle(NUM2UINT(unichar)));
 }
 
 static VALUE
-rg_m_digit_value(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_digit_value(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return INT2NUM(g_unichar_digit_value(NUM2UINT(unichar)));
 }
 
 static VALUE
-rg_m_xdigit_value(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_xdigit_value(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return INT2NUM(g_unichar_xdigit_value(NUM2UINT(unichar)));
 }
 
 static VALUE
-rg_m_type(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_type(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return GENUM2RVAL(g_unichar_type(NUM2UINT(unichar)),
                       G_TYPE_UNICODE_TYPE);
 }
 
 static VALUE
-rg_m_break_type(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_break_type(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return GENUM2RVAL(g_unichar_break_type(NUM2UINT(unichar)),
                       G_TYPE_UNICODE_BREAK_TYPE);
@@ -97,7 +97,7 @@ rg_m_break_type(G_GNUC_UNUSED VALUE self, VALUE unichar)
 
 #if GLIB_CHECK_VERSION(2,4,0)
 static VALUE
-rg_m_get_mirror_char(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_get_mirror_char(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     gunichar mirrored_char;
 
@@ -111,33 +111,33 @@ rg_m_get_mirror_char(G_GNUC_UNUSED VALUE self, VALUE unichar)
 
 #if GLIB_CHECK_VERSION(2,14,0)
 static VALUE
-rg_m_combining_class(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_combining_class(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return INT2NUM(g_unichar_combining_class(NUM2UINT(unichar)));
 }
 
 static VALUE
-rg_m_get_script(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_get_script(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return GENUM2RVAL(g_unichar_get_script(NUM2UINT(unichar)),
                       G_TYPE_UNICODE_SCRIPT);
 }
 
 static VALUE
-rg_m_mark_p(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_mark_p(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return CBOOL2RVAL(g_unichar_ismark(NUM2UINT(unichar)));
 }
 
 static VALUE
-rg_m_zero_width_p(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_zero_width_p(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     return CBOOL2RVAL(g_unichar_iszerowidth(NUM2UINT(unichar)));
 }
 #endif
 
 static VALUE
-rg_m_to_utf8(G_GNUC_UNUSED VALUE self, VALUE unichar)
+rg_s_to_utf8(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
     gchar utf8[6];
     gint len;
@@ -151,59 +151,59 @@ Init_glib_unichar(void)
 {
     VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "UniChar");
 
-    rb_define_module_function(RG_TARGET_NAMESPACE, "alnum?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "alnum?",
                               rbglib_m_unichar_isalnum, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "alpha?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "alpha?",
                               rbglib_m_unichar_isalpha, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "cntrl?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "cntrl?",
                               rbglib_m_unichar_iscntrl, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "digit?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "digit?",
                               rbglib_m_unichar_isdigit, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "graph?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "graph?",
                               rbglib_m_unichar_isgraph, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "lower?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "lower?",
                               rbglib_m_unichar_islower, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "print?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "print?",
                               rbglib_m_unichar_isprint, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "punct?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "punct?",
                               rbglib_m_unichar_ispunct, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "space?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "space?",
                               rbglib_m_unichar_isspace, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "upper?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "upper?",
                               rbglib_m_unichar_isupper, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "xdigit?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "xdigit?",
                               rbglib_m_unichar_isxdigit, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "title?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "title?",
                               rbglib_m_unichar_istitle, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "defined?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "defined?",
                               rbglib_m_unichar_isdefined, 1);
-    rb_define_module_function(RG_TARGET_NAMESPACE, "wide?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "wide?",
                               rbglib_m_unichar_iswide, 1);
 #if GLIB_CHECK_VERSION(2,12,0)
-    rb_define_module_function(RG_TARGET_NAMESPACE, "wide_cjk?",
+    rbg_define_singleton_method(RG_TARGET_NAMESPACE, "wide_cjk?",
                               rbglib_m_unichar_iswide_cjk, 1);
 #endif
 
-    RG_DEF_MODFUNC(to_upper, 1);
-    RG_DEF_MODFUNC(to_lower, 1);
-    RG_DEF_MODFUNC(to_title, 1);
+    RG_DEF_SMETHOD(to_upper, 1);
+    RG_DEF_SMETHOD(to_lower, 1);
+    RG_DEF_SMETHOD(to_title, 1);
 
-    RG_DEF_MODFUNC(digit_value, 1);
-    RG_DEF_MODFUNC(xdigit_value, 1);
+    RG_DEF_SMETHOD(digit_value, 1);
+    RG_DEF_SMETHOD(xdigit_value, 1);
 
-    RG_DEF_MODFUNC(type, 1);
-    RG_DEF_MODFUNC(break_type, 1);
+    RG_DEF_SMETHOD(type, 1);
+    RG_DEF_SMETHOD(break_type, 1);
 
 #if GLIB_CHECK_VERSION(2,4,0)
-    RG_DEF_MODFUNC(get_mirror_char, 1);
+    RG_DEF_SMETHOD(get_mirror_char, 1);
 #endif
 
 #if GLIB_CHECK_VERSION(2,14,0)
-    RG_DEF_MODFUNC(combining_class, 1);
-    RG_DEF_MODFUNC(get_script, 1);
-    RG_DEF_MODFUNC_P(mark, 1);
-    RG_DEF_MODFUNC_P(zero_width, 1);
+    RG_DEF_SMETHOD(combining_class, 1);
+    RG_DEF_SMETHOD(get_script, 1);
+    RG_DEF_SMETHOD_P(mark, 1);
+    RG_DEF_SMETHOD_P(zero_width, 1);
 #endif
 
-    RG_DEF_MODFUNC(to_utf8, 1);
-}
+    RG_DEF_SMETHOD(to_utf8, 1);
+}

data/ext/glib2/rbglib_unicode.c

@@ -83,7 +83,7 @@ Init_glib_unicode(void)
 
     G_DEF_CLASS(G_TYPE_NORMALIZE_MODE, "NormalizeMode", mGLib);
 
-    rb_define_module_function(mGLib, "charset", rbglib_m_charset, 0);
+    rbg_define_singleton_method(mGLib, "charset", rbglib_m_charset, 0);
 
     RG_DEF_SMETHOD(canonical_ordering, 1);
     RG_DEF_SMETHOD(canonical_decomposition, 1);

data/ext/glib2/rbglib_utf16.c

@@ -25,7 +25,7 @@
 #define RG_TARGET_NAMESPACE mUTF16
 
 static VALUE
-rg_m_to_ucs4(G_GNUC_UNUSED VALUE self, VALUE rb_utf16)
+rg_s_to_ucs4(G_GNUC_UNUSED VALUE self, VALUE rb_utf16)
 {
     VALUE result;
     gunichar *ucs4;
@@ -47,7 +47,7 @@ rg_m_to_ucs4(G_GNUC_UNUSED VALUE self, VALUE rb_utf16)
 }
 
 static VALUE
-rg_m_to_utf8(G_GNUC_UNUSED VALUE self, VALUE rb_utf16)
+rg_s_to_utf8(G_GNUC_UNUSED VALUE self, VALUE rb_utf16)
 {
     VALUE result;
     gchar *utf8;
@@ -73,6 +73,6 @@ Init_glib_utf16(void)
 {
     VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "UTF16");
 
-    RG_DEF_MODFUNC(to_ucs4, 1);
-    RG_DEF_MODFUNC(to_utf8, 1);
+    RG_DEF_SMETHOD(to_ucs4, 1);
+    RG_DEF_SMETHOD(to_utf8, 1);
 }

data/ext/glib2/rbglib_utf8.c

@@ -25,7 +25,7 @@
 #define RG_TARGET_NAMESPACE mUTF8
 
 static VALUE
-rg_m_get_char(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+rg_s_get_char(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE utf8, validate;
     gunichar result;
@@ -49,7 +49,7 @@ rg_m_get_char(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 }
 
 static VALUE
-rg_m_size(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
+rg_s_size(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 {
     gchar *utf8;
 
@@ -58,7 +58,7 @@ rg_m_size(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 }
 
 static VALUE
-rg_m_reverse(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
+rg_s_reverse(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 {
     VALUE result;
     gchar *utf8, *reversed_utf8;
@@ -71,7 +71,7 @@ rg_m_reverse(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 }
 
 static VALUE
-rg_m_validate(G_GNUC_UNUSED VALUE self, VALUE str)
+rg_s_validate(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     StringValue(str);
     return CBOOL2RVAL(g_utf8_validate(RSTRING_PTR(str), RSTRING_LEN(str),
@@ -79,7 +79,7 @@ rg_m_validate(G_GNUC_UNUSED VALUE self, VALUE str)
 }
 
 static VALUE
-rg_m_upcase(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
+rg_s_upcase(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 {
     VALUE result;
     gchar *utf8, *upcased_utf8;
@@ -92,7 +92,7 @@ rg_m_upcase(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 }
 
 static VALUE
-rg_m_downcase(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
+rg_s_downcase(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 {
     VALUE result;
     gchar *utf8, *downcased_utf8;
@@ -105,7 +105,7 @@ rg_m_downcase(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 }
 
 static VALUE
-rg_m_casefold(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
+rg_s_casefold(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 {
     VALUE result;
     gchar *utf8, *casefolded_utf8;
@@ -118,7 +118,7 @@ rg_m_casefold(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 }
 
 static VALUE
-rg_m_normalize(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+rg_s_normalize(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE rb_utf8, rb_mode, result;
     gchar *utf8, *normalized_utf8;
@@ -137,14 +137,14 @@ rg_m_normalize(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 }
 
 static VALUE
-rg_m_collate(G_GNUC_UNUSED VALUE self, VALUE utf8a, VALUE utf8b)
+rg_s_collate(G_GNUC_UNUSED VALUE self, VALUE utf8a, VALUE utf8b)
 {
     return INT2NUM(g_utf8_collate(StringValueCStr(utf8a),
                                   StringValueCStr(utf8b)));
 }
 
 static VALUE
-rg_m_collate_key(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+rg_s_collate_key(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE result, rb_utf8, for_filename;
     gchar *key, *utf8;
@@ -167,7 +167,7 @@ rg_m_collate_key(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 }
 
 static VALUE
-rg_m_to_utf16(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
+rg_s_to_utf16(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 {
     VALUE result;
     gchar *utf8;
@@ -190,7 +190,7 @@ rg_m_to_utf16(G_GNUC_UNUSED VALUE self, VALUE rb_utf8)
 }
 
 static VALUE
-rg_m_to_ucs4(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+rg_s_to_ucs4(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE result, rb_utf8, is_fast;
     gchar *utf8;
@@ -226,7 +226,7 @@ Init_glib_utf8(void)
       Not implemented.
       g_utf8_next_char
     */
-    RG_DEF_MODFUNC(get_char, -1);
+    RG_DEF_SMETHOD(get_char, -1);
     /*
       Not implemented.
       g_utf8_offset_to_pointer
@@ -236,24 +236,24 @@ Init_glib_utf8(void)
       g_utf8_find_prev_char
       g_utf8_prev_char
     */
-    RG_DEF_MODFUNC(size, 1);
+    RG_DEF_SMETHOD(size, 1);
     /*
       Not implemented.
       g_utf8_strncpy
       g_utf8_strrchr
     */
-    RG_DEF_MODFUNC(reverse, 1);
-    RG_DEF_MODFUNC(validate, 1);
+    RG_DEF_SMETHOD(reverse, 1);
+    RG_DEF_SMETHOD(validate, 1);
 
-    RG_DEF_MODFUNC(upcase, 1);
-    RG_DEF_MODFUNC(downcase, 1);
-    RG_DEF_MODFUNC(casefold, 1);
+    RG_DEF_SMETHOD(upcase, 1);
+    RG_DEF_SMETHOD(downcase, 1);
+    RG_DEF_SMETHOD(casefold, 1);
 
-    RG_DEF_MODFUNC(normalize, -1);
+    RG_DEF_SMETHOD(normalize, -1);
 
-    RG_DEF_MODFUNC(collate, 2);
-    RG_DEF_MODFUNC(collate_key, -1);
+    RG_DEF_SMETHOD(collate, 2);
+    RG_DEF_SMETHOD(collate_key, -1);
 
-    RG_DEF_MODFUNC(to_utf16, 1);
-    RG_DEF_MODFUNC(to_ucs4, -1);
+    RG_DEF_SMETHOD(to_utf16, 1);
+    RG_DEF_SMETHOD(to_ucs4, -1);
 }

data/ext/glib2/rbglib_utils.c

@@ -26,13 +26,13 @@
 
 #if GLIB_CHECK_VERSION(2,2,0)
 static VALUE
-rg_m_application_name(G_GNUC_UNUSED VALUE self)
+rg_s_application_name(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_application_name());
 }
 
 static VALUE
-rg_m_set_application_name(VALUE self, VALUE application_name)
+rg_s_set_application_name(VALUE self, VALUE application_name)
 {
     g_set_prgname(RVAL2CSTR_ACCEPT_NIL(application_name));
     return self;
@@ -40,27 +40,27 @@ rg_m_set_application_name(VALUE self, VALUE application_name)
 #endif
 
 static VALUE
-rg_m_prgname(G_GNUC_UNUSED VALUE self)
+rg_s_prgname(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_prgname());
 }
 
 static VALUE
-rg_m_set_prgname(VALUE self, VALUE prgname)
+rg_s_set_prgname(VALUE self, VALUE prgname)
 {
     g_set_prgname(RVAL2CSTR_ACCEPT_NIL(prgname));
     return self;
 }
 
 static VALUE
-rg_m_getenv(G_GNUC_UNUSED VALUE self, VALUE variable)
+rg_s_getenv(G_GNUC_UNUSED VALUE self, VALUE variable)
 {
     return CSTR2RVAL(g_getenv(RVAL2CSTR(variable)));
 }
 
 #if GLIB_CHECK_VERSION(2,4,0)
 static VALUE
-rg_m_setenv(G_GNUC_UNUSED VALUE self, VALUE variable, VALUE value, VALUE overwrite)
+rg_s_setenv(G_GNUC_UNUSED VALUE self, VALUE variable, VALUE value, VALUE overwrite)
 {
     return CBOOL2RVAL(g_setenv(RVAL2CSTR(variable), 
                                RVAL2CSTR_ACCEPT_NIL(value),
@@ -68,7 +68,7 @@ rg_m_setenv(G_GNUC_UNUSED VALUE self, VALUE variable, VALUE value, VALUE overwri
 }
 
 static VALUE
-rg_m_unsetenv(VALUE self, VALUE variable)
+rg_s_unsetenv(VALUE self, VALUE variable)
 {
     g_unsetenv(RVAL2CSTR(variable));
     return self;
@@ -78,7 +78,7 @@ rg_m_unsetenv(VALUE self, VALUE variable)
 #if GLIB_CHECK_VERSION(2,8,0)
 #ifdef HAVE_G_LISTENV
 static VALUE
-rg_m_listenv(VALUE self)
+rg_s_listenv(G_GNUC_UNUSED VALUE self)
 {
     gchar** c_list;
     gchar** c_var;
@@ -94,51 +94,51 @@ rg_m_listenv(VALUE self)
 #endif
 
 static VALUE
-rg_m_host_name(G_GNUC_UNUSED VALUE self)
+rg_s_host_name(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_host_name());
 }
 #endif
 
 static VALUE
-rg_m_user_name(G_GNUC_UNUSED VALUE self)
+rg_s_user_name(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_user_name());
 }
 
 static VALUE
-rg_m_real_name(G_GNUC_UNUSED VALUE self)
+rg_s_real_name(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_real_name());
 }
 
 #if GLIB_CHECK_VERSION(2, 6, 0)
 static VALUE
-rg_m_user_cache_dir(G_GNUC_UNUSED VALUE self)
+rg_s_user_cache_dir(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_user_cache_dir());
 }
 
 static VALUE
-rg_m_user_data_dir(G_GNUC_UNUSED VALUE self)
+rg_s_user_data_dir(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_user_data_dir());
 }
 
 static VALUE
-rg_m_user_config_dir(G_GNUC_UNUSED VALUE self)
+rg_s_user_config_dir(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_user_config_dir());
 }
 
 static VALUE
-rg_m_system_data_dirs(G_GNUC_UNUSED VALUE self)
+rg_s_system_data_dirs(G_GNUC_UNUSED VALUE self)
 {
     return STRV2RVAL((const gchar **)g_get_system_data_dirs());
 }
 
 static VALUE
-rg_m_system_config_dirs(G_GNUC_UNUSED VALUE self)
+rg_s_system_config_dirs(G_GNUC_UNUSED VALUE self)
 {
     return STRV2RVAL((const gchar **)g_get_system_config_dirs());
 }
@@ -146,7 +146,7 @@ rg_m_system_config_dirs(G_GNUC_UNUSED VALUE self)
 
 #if GLIB_CHECK_VERSION(2, 14, 0)
 static VALUE
-rg_m_get_user_special_dir(G_GNUC_UNUSED VALUE self, VALUE directory)
+rg_s_get_user_special_dir(G_GNUC_UNUSED VALUE self, VALUE directory)
 {
     return CSTR2RVAL(g_get_user_special_dir(RVAL2GENUM(directory,
                                            G_TYPE_USER_DIRECTORY)));
@@ -154,19 +154,19 @@ rg_m_get_user_special_dir(G_GNUC_UNUSED VALUE self, VALUE directory)
 #endif
 
 static VALUE
-rg_m_home_dir(G_GNUC_UNUSED VALUE self)
+rg_s_home_dir(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_home_dir());
 }
 
 static VALUE
-rg_m_tmp_dir(G_GNUC_UNUSED VALUE self)
+rg_s_tmp_dir(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_tmp_dir());
 }
 
 static VALUE
-rg_m_current_dir(G_GNUC_UNUSED VALUE self)
+rg_s_current_dir(G_GNUC_UNUSED VALUE self)
 {
     gchar* dir = g_get_current_dir();
     VALUE ret = CSTR2RVAL(dir);
@@ -175,25 +175,25 @@ rg_m_current_dir(G_GNUC_UNUSED VALUE self)
 }
 
 static VALUE
-rg_m_path_is_absolute_p(G_GNUC_UNUSED VALUE self, VALUE fname)
+rg_s_path_is_absolute_p(G_GNUC_UNUSED VALUE self, VALUE fname)
 {
     return CBOOL2RVAL(g_path_is_absolute(RVAL2CSTR(fname)));
 }
 
 static VALUE
-rg_m_path_skip_root(G_GNUC_UNUSED VALUE self, VALUE fname)
+rg_s_path_skip_root(G_GNUC_UNUSED VALUE self, VALUE fname)
 {
     return CSTR2RVAL(g_path_skip_root(RVAL2CSTR(fname)));
 }
 
 static VALUE
-rg_m_path_get_basename(G_GNUC_UNUSED VALUE self, VALUE fname)
+rg_s_path_get_basename(G_GNUC_UNUSED VALUE self, VALUE fname)
 {
     return CSTR2RVAL(g_path_get_basename(RVAL2CSTR(fname)));
 }
 
 static VALUE
-rg_m_path_get_dirname(G_GNUC_UNUSED VALUE self, VALUE fname)
+rg_s_path_get_dirname(G_GNUC_UNUSED VALUE self, VALUE fname)
 {
     return CSTR2RVAL(g_path_get_dirname(RVAL2CSTR(fname)));
 }
@@ -211,7 +211,7 @@ gchar*      g_build_pathv                   (const gchar *separator,
 */
 
 static VALUE
-rg_m_find_program_in_path(G_GNUC_UNUSED VALUE self, VALUE program)
+rg_s_find_program_in_path(G_GNUC_UNUSED VALUE self, VALUE program)
 {
     gchar* path = g_find_program_in_path(RVAL2CSTR(program));
     VALUE ret = CSTR2RVAL(path);
@@ -220,25 +220,25 @@ rg_m_find_program_in_path(G_GNUC_UNUSED VALUE self, VALUE program)
 }
 
 static VALUE
-rg_m_bit_nth_lsf(G_GNUC_UNUSED VALUE self, VALUE mask, VALUE nth_bit)
+rg_s_bit_nth_lsf(G_GNUC_UNUSED VALUE self, VALUE mask, VALUE nth_bit)
 {
     return INT2NUM(g_bit_nth_lsf(NUM2ULONG(mask), NUM2INT(nth_bit)));
 }
 
 static VALUE
-rg_m_bit_nth_msf(G_GNUC_UNUSED VALUE self, VALUE mask, VALUE nth_bit)
+rg_s_bit_nth_msf(G_GNUC_UNUSED VALUE self, VALUE mask, VALUE nth_bit)
 {
     return INT2NUM(g_bit_nth_msf(NUM2ULONG(mask), NUM2INT(nth_bit)));
 }
 
 static VALUE
-rg_m_bit_storage(G_GNUC_UNUSED VALUE self, VALUE number)
+rg_s_bit_storage(G_GNUC_UNUSED VALUE self, VALUE number)
 {
     return UINT2NUM(g_bit_storage(NUM2ULONG(number)));
 }
 
 static VALUE
-rg_m_spaced_primes_closest(G_GNUC_UNUSED VALUE self, VALUE num)
+rg_s_spaced_primes_closest(G_GNUC_UNUSED VALUE self, VALUE num)
 {
     return UINT2NUM(g_spaced_primes_closest(NUM2UINT(num)));
 }
@@ -249,7 +249,7 @@ void        g_atexit                        (GVoidFunc func);
 */
 
 static VALUE
-rg_m_parse_debug_string(G_GNUC_UNUSED VALUE self, VALUE string, VALUE keys)
+rg_s_parse_debug_string(G_GNUC_UNUSED VALUE self, VALUE string, VALUE keys)
 {
     gint i, nkeys;
     VALUE ary;
@@ -282,7 +282,7 @@ void        g_nullify_pointer               (gpointer *nullify_location);
 */
 
 static VALUE
-rg_m_check_version_p(G_GNUC_UNUSED VALUE self, VALUE major, VALUE minor, VALUE micro)
+rg_s_check_version_p(G_GNUC_UNUSED VALUE self, VALUE major, VALUE minor, VALUE micro)
 {
     return CBOOL2RVAL(glib_major_version > NUM2UINT(major) ||
                       (glib_major_version == NUM2UINT(major) && 
@@ -302,49 +302,49 @@ Init_glib_utils(void)
 #endif
 
 #if GLIB_CHECK_VERSION(2,2,0)
-    RG_DEF_MODFUNC(application_name, 0);
-    RG_DEF_MODFUNC(set_application_name, 1);
+    RG_DEF_SMETHOD(application_name, 0);
+    RG_DEF_SMETHOD(set_application_name, 1);
 #endif
-    RG_DEF_MODFUNC(prgname, 0);
-    RG_DEF_MODFUNC(set_prgname, 1);
-    RG_DEF_MODFUNC(getenv, 1);
+    RG_DEF_SMETHOD(prgname, 0);
+    RG_DEF_SMETHOD(set_prgname, 1);
+    RG_DEF_SMETHOD(getenv, 1);
 #if GLIB_CHECK_VERSION(2,4,0)
-    RG_DEF_MODFUNC(setenv, 2);
-    RG_DEF_MODFUNC(unsetenv, 1);
+    RG_DEF_SMETHOD(setenv, 2);
+    RG_DEF_SMETHOD(unsetenv, 1);
 #endif
 #if GLIB_CHECK_VERSION(2,8,0)
 #ifdef HAVE_G_LISTENV
-    RG_DEF_MODFUNC(listenv, 0);
+    RG_DEF_SMETHOD(listenv, 0);
 #endif
-    RG_DEF_MODFUNC(host_name, 0);
+    RG_DEF_SMETHOD(host_name, 0);
 #endif
-    RG_DEF_MODFUNC(user_name, 0);
-    RG_DEF_MODFUNC(real_name, 0);
+    RG_DEF_SMETHOD(user_name, 0);
+    RG_DEF_SMETHOD(real_name, 0);
 
 #if GLIB_CHECK_VERSION(2, 6, 0)
-    RG_DEF_MODFUNC(user_cache_dir, 0);
-    RG_DEF_MODFUNC(user_data_dir, 0);
-    RG_DEF_MODFUNC(user_config_dir, 0);
-    RG_DEF_MODFUNC(system_data_dirs, 0);
-    RG_DEF_MODFUNC(system_config_dirs, 0);
+    RG_DEF_SMETHOD(user_cache_dir, 0);
+    RG_DEF_SMETHOD(user_data_dir, 0);
+    RG_DEF_SMETHOD(user_config_dir, 0);
+    RG_DEF_SMETHOD(system_data_dirs, 0);
+    RG_DEF_SMETHOD(system_config_dirs, 0);
 #endif
 #if GLIB_CHECK_VERSION(2, 14, 0)
-    RG_DEF_MODFUNC(get_user_special_dir, 1);
+    RG_DEF_SMETHOD(get_user_special_dir, 1);
 #endif
-    RG_DEF_MODFUNC(home_dir, 0);
-    RG_DEF_MODFUNC(tmp_dir, 0);
-    RG_DEF_MODFUNC(current_dir, 0);
-
-    RG_DEF_MODFUNC_P(path_is_absolute, 1);
-    RG_DEF_MODFUNC(path_skip_root, 1);
-    RG_DEF_MODFUNC(path_get_basename, 1);
-    RG_DEF_MODFUNC(path_get_dirname, 1);
-    RG_DEF_MODFUNC(find_program_in_path, 1);
-    RG_DEF_MODFUNC(bit_nth_lsf, 2);
-    RG_DEF_MODFUNC(bit_nth_msf, 2);
-    RG_DEF_MODFUNC(bit_storage, 1);
-    RG_DEF_MODFUNC(spaced_primes_closest, 1);
-    RG_DEF_MODFUNC(parse_debug_string, 2);
-    RG_DEF_MODFUNC_P(check_version, 3);
+    RG_DEF_SMETHOD(home_dir, 0);
+    RG_DEF_SMETHOD(tmp_dir, 0);
+    RG_DEF_SMETHOD(current_dir, 0);
+
+    RG_DEF_SMETHOD_P(path_is_absolute, 1);
+    RG_DEF_SMETHOD(path_skip_root, 1);
+    RG_DEF_SMETHOD(path_get_basename, 1);
+    RG_DEF_SMETHOD(path_get_dirname, 1);
+    RG_DEF_SMETHOD(find_program_in_path, 1);
+    RG_DEF_SMETHOD(bit_nth_lsf, 2);
+    RG_DEF_SMETHOD(bit_nth_msf, 2);
+    RG_DEF_SMETHOD(bit_storage, 1);
+    RG_DEF_SMETHOD(spaced_primes_closest, 1);
+    RG_DEF_SMETHOD(parse_debug_string, 2);
+    RG_DEF_SMETHOD_P(check_version, 3);
 
 }