glib2 1.1.2 → 1.1.3

data/ext/glib2/rbglib.c

@@ -914,7 +914,7 @@ Init_mem()
 #endif
 
 static VALUE
-rg_m_os_win32_p(G_GNUC_UNUSED VALUE self)
+rg_s_os_win32_p(G_GNUC_UNUSED VALUE self)
 {
 #ifdef G_OS_WIN32
     return Qtrue;
@@ -924,7 +924,7 @@ rg_m_os_win32_p(G_GNUC_UNUSED VALUE self)
 }
 
 static VALUE
-rg_m_os_beos_p(G_GNUC_UNUSED VALUE self)
+rg_s_os_beos_p(G_GNUC_UNUSED VALUE self)
 {
 #ifdef G_OS_BEOS
     return Qtrue;
@@ -934,7 +934,7 @@ rg_m_os_beos_p(G_GNUC_UNUSED VALUE self)
 }
 
 static VALUE
-rg_m_os_unix_p(G_GNUC_UNUSED VALUE self)
+rg_s_os_unix_p(G_GNUC_UNUSED VALUE self)
 {
 #ifdef G_OS_UNIX
     return Qtrue;
@@ -1024,9 +1024,9 @@ Init_glib2(void)
     rb_define_const(RG_TARGET_NAMESPACE, "MAXDOUBLE", DBL2NUM(G_MAXDOUBLE));
 
     /* Standard Macros */
-    RG_DEF_MODFUNC_P(os_win32, 0);
-    RG_DEF_MODFUNC_P(os_beos, 0);
-    RG_DEF_MODFUNC_P(os_unix, 0);
+    RG_DEF_SMETHOD_P(os_win32, 0);
+    RG_DEF_SMETHOD_P(os_beos, 0);
+    RG_DEF_SMETHOD_P(os_unix, 0);
 
     rb_define_const(RG_TARGET_NAMESPACE, "DIR_SEPARATOR", CSTR2RVAL(G_DIR_SEPARATOR_S));
     rb_define_const(RG_TARGET_NAMESPACE, "SEARCHPATH_SEPARATOR", CSTR2RVAL(G_SEARCHPATH_SEPARATOR_S));
@@ -1123,7 +1123,4 @@ union       GDoubleIEEE754;
     Init_glib_unichar();
     Init_glib_keyfile();
     Init_glib_bookmark_file();
-
-    /* This is called here once. */
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/glib2/rbglib.h

@@ -35,7 +35,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 1
 #define RBGLIB_MINOR_VERSION 1
-#define RBGLIB_MICRO_VERSION 2
+#define RBGLIB_MICRO_VERSION 3
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/ext/glib2/rbglib_convert.c

@@ -26,7 +26,7 @@
 #define RG_TARGET_NAMESPACE mGLib
 
 static VALUE
-rg_m_convert(G_GNUC_UNUSED VALUE self, VALUE str, VALUE to, VALUE from)
+rg_s_convert(G_GNUC_UNUSED VALUE self, VALUE str, VALUE to, VALUE from)
 {
     GError *err = NULL;
     gchar* ret;
@@ -46,7 +46,7 @@ rg_m_convert(G_GNUC_UNUSED VALUE self, VALUE str, VALUE to, VALUE from)
 }
 
 static VALUE
-rg_m_locale_to_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
+rg_s_locale_to_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     GError *err = NULL;
     VALUE s = Qnil;
@@ -65,7 +65,7 @@ rg_m_locale_to_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 }
 
 static VALUE
-rg_m_locale_from_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
+rg_s_locale_from_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     GError *err = NULL;
     VALUE s = Qnil;
@@ -84,7 +84,7 @@ rg_m_locale_from_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 }
 
 static VALUE
-rg_m_filename_to_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
+rg_s_filename_to_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     GError *err = NULL;
     VALUE s = Qnil;
@@ -103,7 +103,7 @@ rg_m_filename_to_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 }
 
 static VALUE
-rg_m_filename_from_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
+rg_s_filename_from_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     GError *err = NULL;
     VALUE s = Qnil;
@@ -122,7 +122,7 @@ rg_m_filename_from_utf8(G_GNUC_UNUSED VALUE self, VALUE str)
 }
 
 static VALUE
-rg_m_filename_to_uri(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+rg_s_filename_to_uri(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE filename, hostname, s;
     GError *err = NULL;
@@ -142,7 +142,7 @@ rg_m_filename_to_uri(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 }
 
 static VALUE
-rg_m_filename_from_uri(G_GNUC_UNUSED VALUE self, VALUE str)
+rg_s_filename_from_uri(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     GError *err = NULL;
     VALUE s;
@@ -161,7 +161,7 @@ rg_m_filename_from_uri(G_GNUC_UNUSED VALUE self, VALUE str)
 }
 
 static VALUE
-rg_m_utf8_validate(G_GNUC_UNUSED VALUE self, VALUE str)
+rg_s_utf8_validate(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     rb_warning("GLib.utf8_validate is deprecated. Use GLib::UTF8.validate instead.");
     StringValue(str);
@@ -183,15 +183,15 @@ Init_glib_convert(void)
     /* glib/gunicode.h */
     /* just for backward compatibility.
        Use GLib::UTF8.validate instead. */
-    RG_DEF_MODFUNC(utf8_validate, 1);
+    RG_DEF_SMETHOD(utf8_validate, 1);
 
     /* glib/gconvert.h */
-    RG_DEF_MODFUNC(convert, 3);
-    RG_DEF_MODFUNC(locale_to_utf8, 1);
-    RG_DEF_MODFUNC(locale_from_utf8, 1);
-    RG_DEF_MODFUNC(filename_to_utf8, 1);
-    RG_DEF_MODFUNC(filename_from_utf8, 1);
-
-    RG_DEF_MODFUNC(filename_to_uri, -1);
-    RG_DEF_MODFUNC(filename_from_uri, 1);
+    RG_DEF_SMETHOD(convert, 3);
+    RG_DEF_SMETHOD(locale_to_utf8, 1);
+    RG_DEF_SMETHOD(locale_from_utf8, 1);
+    RG_DEF_SMETHOD(filename_to_utf8, 1);
+    RG_DEF_SMETHOD(filename_from_utf8, 1);
+
+    RG_DEF_SMETHOD(filename_to_uri, -1);
+    RG_DEF_SMETHOD(filename_from_uri, 1);
 }

data/ext/glib2/rbglib_fileutils.c

@@ -88,7 +88,7 @@ Init_glib_fileutils(void)
     rb_define_const(RG_TARGET_NAMESPACE, "FAILED", INT2NUM(G_FILE_ERROR_FAILED));
 
 #if GLIB_CHECK_VERSION(2, 16, 0)
-    rb_define_module_function(mGLib, "format_size_for_display",
+    rbg_define_singleton_method(mGLib, "format_size_for_display",
 			      rbglib_m_format_size_for_display, 1);
 #endif
 }

data/ext/glib2/rbglib_i18n.c

@@ -28,7 +28,7 @@
 
 #if GLIB_CHECK_VERSION(2,6,0)
 static VALUE
-rg_m_language_names(G_GNUC_UNUSED VALUE self)
+rg_s_language_names(G_GNUC_UNUSED VALUE self)
 {
     return STRV2RVAL((const gchar **)g_get_language_names());
 }
@@ -39,6 +39,6 @@ Init_glib_i18n(void)
 {
     /* glib/gi18n.h */
 #if GLIB_CHECK_VERSION(2,6,0)
-    RG_DEF_MODFUNC(language_names, 0);
+    RG_DEF_SMETHOD(language_names, 0);
 #endif
 }

data/ext/glib2/rbglib_iochannel.c

@@ -787,8 +787,6 @@ Init_glib_io_channel(void)
     RG_DEF_METHOD(encoding, 0);
     RG_DEF_METHOD(set_encoding, 1);
 
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-
     /* GSeekType */
     rb_define_const(RG_TARGET_NAMESPACE, "SEEK_CUR", INT2NUM(G_SEEK_CUR));
     rb_define_const(RG_TARGET_NAMESPACE, "SEEK_SET", INT2NUM(G_SEEK_SET));

data/ext/glib2/rbglib_maincontext.c

@@ -94,7 +94,7 @@ rg_poll(GPollFD *ufds, guint nfsd, gint timeout)
 }
 
 static VALUE
-ruby_source_set_priority (VALUE self, VALUE priority)
+ruby_source_set_priority (G_GNUC_UNUSED VALUE self, G_GNUC_UNUSED VALUE priority)
 {
     return Qnil;
 }
@@ -689,7 +689,7 @@ rg_remove_poll(VALUE self, VALUE fd)
 
 #ifdef HAVE_G_MAIN_DEPTH
 static VALUE
-rg_s_depth(VALUE self)
+rg_s_depth(G_GNUC_UNUSED VALUE self)
 {
     return INT2NUM(g_main_depth());
 }
@@ -854,15 +854,13 @@ Init_glib_main_context(void)
     id__callbacks__ = rb_intern("__callbacks__");
     callbacks_table = g_hash_table_new(NULL, NULL);
 
-    rb_define_singleton_method(mGLib, "set_ruby_thread_priority",
-                               ruby_source_set_priority, 1);
-    rb_define_singleton_method(mGLib, "ruby_thread_priority=",
+    rbg_define_singleton_method(mGLib, "set_ruby_thread_priority",
                                ruby_source_set_priority, 1);
 
     mGLibSource = rb_const_get(mGLib, rb_intern("Source"));
-    rb_define_singleton_method(mGLibSource, "remove", source_remove, 1);
+    rbg_define_singleton_method(mGLibSource, "remove", source_remove, 1);
 #if GLIB_CHECK_VERSION(2,12,0)
-    rb_define_singleton_method(mGLibSource, "current", source_current_source, 0);
+    rbg_define_singleton_method(mGLibSource, "current", source_current_source, 0);
 #endif
 /*
     id_poll_func = rb_intern("__poll_func__");
@@ -892,21 +890,21 @@ Init_glib_main_context(void)
 #ifdef HAVE_G_MAIN_DEPTH
     RG_DEF_SMETHOD(depth, 0);
 #endif
-    rb_define_module_function(timeout, "source_new", timeout_source_new, 1);
+    rbg_define_singleton_method(timeout, "source_new", timeout_source_new, 1);
 #if GLIB_CHECK_VERSION(2,14,0)
-    rb_define_module_function(timeout, "source_new_seconds", timeout_source_new_seconds, 1);
+    rbg_define_singleton_method(timeout, "source_new_seconds", timeout_source_new_seconds, 1);
 #endif
-    rb_define_module_function(timeout, "add", timeout_add, -1);
+    rbg_define_singleton_method(timeout, "add", timeout_add, -1);
 #if GLIB_CHECK_VERSION(2,14,0)
-    rb_define_module_function(timeout, "add_seconds", timeout_add_seconds, -1);
+    rbg_define_singleton_method(timeout, "add_seconds", timeout_add_seconds, -1);
 #endif
-    rb_define_module_function(idle, "source_new", idle_source_new, 0);
-    rb_define_module_function(idle, "add", idle_add, -1);
-    rb_define_module_function(idle, "remove", idle_remove, 1);
+    rbg_define_singleton_method(idle, "source_new", idle_source_new, 0);
+    rbg_define_singleton_method(idle, "add", idle_add, -1);
+    rbg_define_singleton_method(idle, "remove", idle_remove, 1);
 
 #if GLIB_CHECK_VERSION(2,4,0)
-    rb_define_module_function(child_watch, "source_new", child_watch_source_new, 1);
-    rb_define_module_function(child_watch, "add", child_watch_add, 1);
+    rbg_define_singleton_method(child_watch, "source_new", child_watch_source_new, 1);
+    rbg_define_singleton_method(child_watch, "add", child_watch_add, 1);
 #endif
 
     default_poll_func = g_main_context_get_poll_func(NULL);

data/ext/glib2/rbglib_messages.c

@@ -35,7 +35,6 @@
 #define RG_TARGET_NAMESPACE mLog
 
 static VALUE rbglib_log_handler_procs;
-static ID id_call;
 static gboolean log_canceled;
 
 static const gchar *
@@ -73,14 +72,14 @@ rbglib_log_handler(const gchar *log_domain, GLogLevelFlags log_level, const gcha
 
 /* Use Internal only */
 static VALUE
-rg_m_cancel_handler(G_GNUC_UNUSED VALUE self)
+rg_s_cancel_handler(G_GNUC_UNUSED VALUE self)
 {
     log_canceled = TRUE;
     return Qnil;
 }
 
 static VALUE
-rg_m_set_handler(VALUE self, VALUE domain, VALUE levels)
+rg_s_set_handler(VALUE self, VALUE domain, VALUE levels)
 {
     guint handler_id = g_log_set_handler(RVAL2CSTR_ACCEPT_NIL(domain),
                                          NUM2INT(levels),
@@ -89,7 +88,7 @@ rg_m_set_handler(VALUE self, VALUE domain, VALUE levels)
 }
 
 static VALUE
-rg_m_remove_handler(VALUE self, VALUE domain, VALUE handler_id)
+rg_s_remove_handler(VALUE self, VALUE domain, VALUE handler_id)
 {
     g_log_remove_handler(RVAL2CSTR_ACCEPT_NIL(domain),
                          NUM2UINT(handler_id));
@@ -98,20 +97,20 @@ rg_m_remove_handler(VALUE self, VALUE domain, VALUE handler_id)
 }
 
 static VALUE
-rg_m_set_always_fatal(G_GNUC_UNUSED VALUE self, VALUE fatal_mask)
+rg_s_set_always_fatal(G_GNUC_UNUSED VALUE self, VALUE fatal_mask)
 {
     return INT2NUM(g_log_set_always_fatal(NUM2INT(fatal_mask)));
 }
 
 static VALUE
-rg_m_set_fatal_mask(G_GNUC_UNUSED VALUE self, VALUE domain, VALUE fatal_mask)
+rg_s_set_fatal_mask(G_GNUC_UNUSED VALUE self, VALUE domain, VALUE fatal_mask)
 {
     return INT2NUM(g_log_set_fatal_mask(RVAL2CSTR_ACCEPT_NIL(domain),
                                         NUM2INT(fatal_mask)));
 }
 
 static VALUE
-rg_m_log(G_GNUC_UNUSED VALUE self, VALUE domain, VALUE level, VALUE str)
+rg_s_log(G_GNUC_UNUSED VALUE self, VALUE domain, VALUE level, VALUE str)
 {
     g_log(RVAL2CSTR_ACCEPT_NIL(domain), NUM2INT(level), "%s", RVAL2CSTR(str));
     return Qnil;
@@ -122,17 +121,16 @@ Init_glib_messages(void)
 {
     VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "Log");
 
-    id_call = rb_intern("call");
     log_canceled = FALSE;
 
     rb_global_variable(&rbglib_log_handler_procs);
     rbglib_log_handler_procs = rb_hash_new();
-    RG_DEF_MODFUNC(set_handler, 2);
-    RG_DEF_MODFUNC(remove_handler, 2);
-    RG_DEF_MODFUNC(cancel_handler, 0);
-    RG_DEF_MODFUNC(set_always_fatal, 1);
-    RG_DEF_MODFUNC(set_fatal_mask, 2);
-    RG_DEF_MODFUNC(log, 3);
+    RG_DEF_SMETHOD(set_handler, 2);
+    RG_DEF_SMETHOD(remove_handler, 2);
+    RG_DEF_SMETHOD(cancel_handler, 0);
+    RG_DEF_SMETHOD(set_always_fatal, 1);
+    RG_DEF_SMETHOD(set_fatal_mask, 2);
+    RG_DEF_SMETHOD(log, 3);
 
     rb_define_const(RG_TARGET_NAMESPACE, "FATAL_MASK", INT2NUM(G_LOG_FATAL_MASK));
     rb_define_const(RG_TARGET_NAMESPACE, "LEVEL_USER_SHIFT", INT2NUM(G_LOG_LEVEL_USER_SHIFT));

data/ext/glib2/rbglib_pollfd.c

@@ -109,7 +109,4 @@ Init_glib_poll_fd(void)
     RG_DEF_METHOD(events, 0);
     RG_DEF_METHOD(set_revents, 1);
     RG_DEF_METHOD(revents, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-
 }

data/ext/glib2/rbglib_shell.c

@@ -24,7 +24,7 @@
 #define RG_TARGET_NAMESPACE mShell
 
 static VALUE
-rg_m_parse(G_GNUC_UNUSED VALUE self, VALUE command_line)
+rg_s_parse(G_GNUC_UNUSED VALUE self, VALUE command_line)
 {
     gint argc;
     gchar **argv;
@@ -37,13 +37,13 @@ rg_m_parse(G_GNUC_UNUSED VALUE self, VALUE command_line)
 }
 
 static VALUE
-rg_m_quote(G_GNUC_UNUSED VALUE self, VALUE unquoted_string)
+rg_s_quote(G_GNUC_UNUSED VALUE self, VALUE unquoted_string)
 {
     return CSTR2RVAL_FREE(g_shell_quote(RVAL2CSTR(unquoted_string)));
 }
 
 static VALUE
-rg_m_unquote(G_GNUC_UNUSED VALUE self, VALUE quoted_string)
+rg_s_unquote(G_GNUC_UNUSED VALUE self, VALUE quoted_string)
 {
     GError *error = NULL;
     gchar *str = g_shell_unquote(RVAL2CSTR(quoted_string), &error);
@@ -58,7 +58,7 @@ Init_glib_shell(void)
 {
     VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "Shell");
 
-    RG_DEF_MODFUNC(parse, 1);
-    RG_DEF_MODFUNC(quote, 1);
-    RG_DEF_MODFUNC(unquote, 1);
+    RG_DEF_SMETHOD(parse, 1);
+    RG_DEF_SMETHOD(quote, 1);
+    RG_DEF_SMETHOD(unquote, 1);
 }

data/ext/glib2/rbglib_source.c

@@ -184,6 +184,4 @@ Init_glib_source(void)
     RG_DEF_METHOD(current_time, 0);
 
     /* GLib::Source.remove is moved to rbglib_maincontext.c */
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/glib2/rbglib_spawn.c

@@ -37,7 +37,7 @@ child_setup(gpointer func)
 }
 
 static VALUE
-rg_m_async_with_pipes(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE flags)
+rg_s_async_with_pipes(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE flags)
 {
     GError *err = NULL;
     gboolean ret;
@@ -73,7 +73,7 @@ rg_m_async_with_pipes(VALUE self, VALUE working_directory, VALUE argv, VALUE env
 }
 
 static VALUE
-rg_m_async(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE flags)
+rg_s_async(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE flags)
 {
     GError *err = NULL;
     gboolean ret;
@@ -102,7 +102,7 @@ rg_m_async(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE fl
 }
 
 static VALUE
-rg_m_sync(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE flags)
+rg_s_sync(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE flags)
 {
     GError *err = NULL;
     gboolean ret;
@@ -153,7 +153,7 @@ rg_m_sync(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE fla
 }
 
 static VALUE
-rg_m_command_line_sync(G_GNUC_UNUSED VALUE self, VALUE str)
+rg_s_command_line_sync(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     GError *err = NULL;
     const gchar *command_line;
@@ -190,7 +190,7 @@ rg_m_command_line_sync(G_GNUC_UNUSED VALUE self, VALUE str)
 }
 
 static VALUE
-rg_m_command_line_async(G_GNUC_UNUSED VALUE self, VALUE str)
+rg_s_command_line_async(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     GError *err = NULL;
     const gchar *command_line;
@@ -209,7 +209,7 @@ rg_m_command_line_async(G_GNUC_UNUSED VALUE self, VALUE str)
 #define RVAL2GPID(value) ((GPid)NUM2INT(pid))
 
 static VALUE
-rg_m_close_pid(VALUE self, VALUE pid)
+rg_s_close_pid(G_GNUC_UNUSED VALUE self, VALUE pid)
 {
     g_spawn_close_pid(RVAL2GPID(pid));
     return Qnil;
@@ -226,13 +226,13 @@ Init_glib_spawn(void)
     id_new = rb_intern("new");
 
     /* glib/gspawn.h */
-    RG_DEF_MODFUNC(async_with_pipes, 4);
-    RG_DEF_MODFUNC(async, 4);
-    RG_DEF_MODFUNC(sync, 4);
-    RG_DEF_MODFUNC(command_line_sync, 1);
-    RG_DEF_MODFUNC(command_line_async, 1);
+    RG_DEF_SMETHOD(async_with_pipes, 4);
+    RG_DEF_SMETHOD(async, 4);
+    RG_DEF_SMETHOD(sync, 4);
+    RG_DEF_SMETHOD(command_line_sync, 1);
+    RG_DEF_SMETHOD(command_line_async, 1);
 #ifdef HAVE_G_SPAWN_CLOSE_PID
-    RG_DEF_MODFUNC(close_pid, 1);
+    RG_DEF_SMETHOD(close_pid, 1);
 #endif
 
     rb_define_const(RG_TARGET_NAMESPACE, "LEAVE_DESCRIPTORS_OPEN", INT2NUM(G_SPAWN_LEAVE_DESCRIPTORS_OPEN));