glib2 2.0.2 → 2.0.3

data/ext/glib2/rbglib_maincontext.c

@@ -419,13 +419,11 @@ source_remove(G_GNUC_UNUSED VALUE self, VALUE tag)
     return CBOOL2RVAL(g_source_remove(NUM2UINT(tag)));
 }
 
-#if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
 source_current_source(G_GNUC_UNUSED VALUE self)
 {
     return BOXED2RVAL(g_main_current_source, G_TYPE_SOURCE);
 }
-#endif
 
 static gboolean
 invoke_source_func(gpointer data)
@@ -533,13 +531,11 @@ rg_release(VALUE self)
     return self;
 }
 
-#if GLIB_CHECK_VERSION(2,10,0)
 static VALUE
 rg_owner_p(VALUE self)
 {
     return CBOOL2RVAL(g_main_context_is_owner(_SELF(self)));
 }
-#endif
 
 /*
 gboolean    g_main_context_wait             (GMainContext *context,
@@ -805,7 +801,6 @@ idle_remove(G_GNUC_UNUSED VALUE self, VALUE func)
     return CBOOL2RVAL(g_idle_remove_by_data((gpointer)info));
 }
 
-#if GLIB_CHECK_VERSION(2,4,0)
 static VALUE
 child_watch_source_new(G_GNUC_UNUSED VALUE self, VALUE pid)
 {
@@ -826,7 +821,6 @@ child_watch_add(VALUE self, VALUE pid)
     return UINT2NUM(g_child_watch_add((GPid)NUM2INT(pid), 
                                       (GChildWatchFunc)child_watch_func, (gpointer)func));
 }
-#endif
 
 #ifndef HAVE_RB_THREAD_BLOCKING_REGION
 static void
@@ -846,9 +840,7 @@ Init_glib_main_context(void)
 
     VALUE timeout = rb_define_module_under(mGLib, "Timeout");
     VALUE idle = rb_define_module_under(mGLib, "Idle");
-#if GLIB_CHECK_VERSION(2,4,0)
     VALUE child_watch = rb_define_module_under(mGLib, "ChildWatch");
-#endif
 
     id_call = rb_intern("call");
     id__callbacks__ = rb_intern("__callbacks__");
@@ -859,9 +851,7 @@ Init_glib_main_context(void)
 
     mGLibSource = rb_const_get(mGLib, rb_intern("Source"));
     rbg_define_singleton_method(mGLibSource, "remove", source_remove, 1);
-#if GLIB_CHECK_VERSION(2,12,0)
     rbg_define_singleton_method(mGLibSource, "current", source_current_source, 0);
-#endif
 /*
     id_poll_func = rb_intern("__poll_func__");
 */
@@ -873,9 +863,7 @@ Init_glib_main_context(void)
     RG_DEF_METHOD(wakeup, 0);
     RG_DEF_METHOD(acquire, 0);
     RG_DEF_METHOD(release, 0);
-#if GLIB_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD_P(owner, 0);
-#endif
     RG_DEF_METHOD(prepare, 0);
     RG_DEF_METHOD(query, 1);
 /*
@@ -902,10 +890,8 @@ Init_glib_main_context(void)
     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)
     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);
     g_main_context_set_poll_func(NULL, rg_poll);

data/ext/glib2/rbglib_source.c

@@ -63,13 +63,11 @@ rg_attach(int argc, VALUE *argv, VALUE self)
                                     RVAL2BOXED(context, G_TYPE_MAIN_CONTEXT)));
 }
 
-#if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
 rg_destroyed_p(VALUE self)
 {
     return CBOOL2RVAL(g_source_is_destroyed(_SELF(self)));
 }
-#endif
 
 static VALUE
 rg_set_priority(VALUE self, VALUE priority)
@@ -178,9 +176,7 @@ Init_glib_source(void)
                     "CONTINUE", CBOOL2RVAL(G_SOURCE_CONTINUE));
 
     RG_DEF_METHOD(attach, -1);
-#if GLIB_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD_P(destroyed, 0);
-#endif
     RG_DEF_METHOD(set_priority, 1);
     RG_DEF_METHOD(priority, 0);
     RG_DEF_METHOD(set_can_recurse, 1);

data/ext/glib2/rbglib_timer.c

@@ -90,14 +90,12 @@ rg_stop(VALUE self)
     return self;
 }
 
-#if GLIB_CHECK_VERSION(2,4,0)
 static VALUE
 rg_continue(VALUE self)
 {
     g_timer_continue(_SELF(self));
     return self;
 }
-#endif
 
 static VALUE
 rg_elapsed(VALUE self)
@@ -123,9 +121,7 @@ Init_glib_timer(void)
     RG_DEF_METHOD(initialize, 0);
     RG_DEF_METHOD(start, 0);
     RG_DEF_METHOD(stop, 0);
-#if GLIB_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(continue, 0);
-#endif
     RG_DEF_METHOD(elapsed, 0);
     RG_DEF_METHOD(reset, 0);
 }

data/ext/glib2/rbglib_unichar.c

@@ -45,9 +45,7 @@ DEF_IS_UNICHAR(xdigit)
 DEF_IS_UNICHAR(title)
 DEF_IS_UNICHAR(defined)
 DEF_IS_UNICHAR(wide)
-#if GLIB_CHECK_VERSION(2,12,0)
 DEF_IS_UNICHAR(wide_cjk)
-#endif
 
 #undef DEF_IS_UNICHAR
 
@@ -95,7 +93,6 @@ rg_s_break_type(G_GNUC_UNUSED VALUE self, VALUE unichar)
                       G_TYPE_UNICODE_BREAK_TYPE);
 }
 
-#if GLIB_CHECK_VERSION(2,4,0)
 static VALUE
 rg_s_get_mirror_char(G_GNUC_UNUSED VALUE self, VALUE unichar)
 {
@@ -107,7 +104,6 @@ rg_s_get_mirror_char(G_GNUC_UNUSED VALUE self, VALUE unichar)
         return unichar;
     }
 }
-#endif
 
 #if GLIB_CHECK_VERSION(2,14,0)
 static VALUE
@@ -179,10 +175,8 @@ Init_glib_unichar(void)
                               rbglib_m_unichar_isdefined, 1);
     rbg_define_singleton_method(RG_TARGET_NAMESPACE, "wide?",
                               rbglib_m_unichar_iswide, 1);
-#if GLIB_CHECK_VERSION(2,12,0)
     rbg_define_singleton_method(RG_TARGET_NAMESPACE, "wide_cjk?",
                               rbglib_m_unichar_iswide_cjk, 1);
-#endif
 
     RG_DEF_SMETHOD(to_upper, 1);
     RG_DEF_SMETHOD(to_lower, 1);
@@ -194,9 +188,7 @@ Init_glib_unichar(void)
     RG_DEF_SMETHOD(type, 1);
     RG_DEF_SMETHOD(break_type, 1);
 
-#if GLIB_CHECK_VERSION(2,4,0)
     RG_DEF_SMETHOD(get_mirror_char, 1);
-#endif
 
 #if GLIB_CHECK_VERSION(2,14,0)
     RG_DEF_SMETHOD(combining_class, 1);

data/ext/glib2/rbglib_utf8.c

@@ -154,11 +154,9 @@ rg_s_collate_key(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 
     utf8 = StringValueCStr(rb_utf8);
     len = RSTRING_LEN(rb_utf8);
-#if GLIB_CHECK_VERSION(2,8,0)
     if (RVAL2CBOOL(for_filename))
         key = g_utf8_collate_key_for_filename(utf8, len);
     else
-#endif
         key = g_utf8_collate_key(utf8, len);
 
     result = CSTR2RVAL(key);

data/ext/glib2/rbglib_utils.c

@@ -24,7 +24,6 @@
 
 #define RG_TARGET_NAMESPACE mGLib
 
-#if GLIB_CHECK_VERSION(2,2,0)
 static VALUE
 rg_s_application_name(G_GNUC_UNUSED VALUE self)
 {
@@ -37,7 +36,6 @@ rg_s_set_application_name(VALUE self, VALUE application_name)
     g_set_prgname(RVAL2CSTR_ACCEPT_NIL(application_name));
     return self;
 }
-#endif
 
 static VALUE
 rg_s_prgname(G_GNUC_UNUSED VALUE self)
@@ -58,7 +56,6 @@ 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_s_setenv(G_GNUC_UNUSED VALUE self, VALUE variable, VALUE value, VALUE overwrite)
 {
@@ -73,9 +70,7 @@ rg_s_unsetenv(VALUE self, VALUE variable)
     g_unsetenv(RVAL2CSTR(variable));
     return self;
 }
-#endif
 
-#if GLIB_CHECK_VERSION(2,8,0)
 #ifdef HAVE_G_LISTENV
 static VALUE
 rg_s_listenv(G_GNUC_UNUSED VALUE self)
@@ -98,7 +93,6 @@ rg_s_host_name(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(g_get_host_name());
 }
-#endif
 
 static VALUE
 rg_s_user_name(G_GNUC_UNUSED VALUE self)
@@ -112,7 +106,6 @@ 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_s_user_cache_dir(G_GNUC_UNUSED VALUE self)
 {
@@ -142,7 +135,6 @@ rg_s_system_config_dirs(G_GNUC_UNUSED VALUE self)
 {
     return STRV2RVAL((const gchar **)g_get_system_config_dirs());
 }
-#endif
 
 #if GLIB_CHECK_VERSION(2, 14, 0)
 static VALUE
@@ -301,33 +293,25 @@ Init_glib_utils(void)
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, G_TYPE_USER_DIRECTORY, "G_");
 #endif
 
-#if GLIB_CHECK_VERSION(2,2,0)
     RG_DEF_SMETHOD(application_name, 0);
     RG_DEF_SMETHOD(set_application_name, 1);
-#endif
     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_SMETHOD(setenv, 2);
     RG_DEF_SMETHOD(unsetenv, 1);
-#endif
-#if GLIB_CHECK_VERSION(2,8,0)
 #ifdef HAVE_G_LISTENV
     RG_DEF_SMETHOD(listenv, 0);
 #endif
     RG_DEF_SMETHOD(host_name, 0);
-#endif
     RG_DEF_SMETHOD(user_name, 0);
     RG_DEF_SMETHOD(real_name, 0);
 
-#if GLIB_CHECK_VERSION(2, 6, 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_SMETHOD(get_user_special_dir, 1);
 #endif

data/ext/glib2/rbglib_win32.c

@@ -45,15 +45,12 @@ rbglib_m_win32_locale_deprecated(VALUE self)
     return rg_s_locale(self);
 }
 
-#if GLIB_CHECK_VERSION(2,6,0)
 static VALUE
 rg_s_version(VALUE self)
 {
     return UINT2NUM(g_win32_get_windows_version());
 }
-#endif
 
-#if GLIB_CHECK_VERSION(2,8,0)
 static VALUE
 rg_s_locale_filename_from_utf8(VALUE self, VALUE utf8_filename)
 {
@@ -68,8 +65,6 @@ rbglib_m_win32_locale_filename_from_utf8_deprecated(VALUE self,
     return rg_s_locale_filename_from_utf8(self, utf8_filename);
 }
 
-#endif
-
 #  if GLIB_CHECK_VERSION(2, 16, 0)
 static VALUE
 rg_s_get_package_installation_directory_of_module(int argc,
@@ -105,12 +100,10 @@ Init_glib_win32(void)
     /* Deprecated */
     rbg_define_singleton_method(mGLib, "win32_locale", rbglib_m_win32_locale_deprecated, 0);
 
-#  if GLIB_CHECK_VERSION(2,8,0)
     RG_DEF_SMETHOD(locale_filename_from_utf8, 1);
     /* Deprecated */
     rbg_define_singleton_method(mGLib, "win32_locale_filename_from_utf8",
                               rbglib_m_win32_locale_filename_from_utf8_deprecated, 1);
-#  endif
 
 #  if GLIB_CHECK_VERSION(2, 16, 0)
     RG_DEF_SMETHOD(get_package_installation_directory_of_module, -1);

data/ext/glib2/rbgobj_object.c

@@ -156,22 +156,10 @@ rbgobj_get_gobject(VALUE obj)
     return holder->gobj;
 }
 
-static VALUE
-dummy_init(int argc, VALUE *argv, VALUE self)
-{
-    GType gtype = CLASS2GTYPE(CLASS_OF(self));
-    if (G_TYPE_IS_ABSTRACT(gtype))
-        rb_raise(rb_eTypeError, "initializing abstract class");
-    else
-        return rb_call_super(argc, argv);
-}
-
 void
 rbgobj_init_object_class(VALUE klass)
 {
     rbgobj_define_property_accessors(klass);
-    if (G_TYPE_IS_ABSTRACT(CLASS2GTYPE(klass)))
-        rbg_define_method(klass, "initialize", dummy_init, -1);
 }
 
 /**********************************************************************/
@@ -629,9 +617,17 @@ rg_type_name(VALUE self)
 static VALUE
 rg_initialize(int argc, VALUE *argv, VALUE self)
 {
+    GType gtype;
     VALUE params_hash;
     GObject* gobj;
 
+    gtype = CLASS2GTYPE(CLASS_OF(self));
+    if (G_TYPE_IS_ABSTRACT(gtype)) {
+        rb_raise(rb_eTypeError,
+                 "initializing abstract class: %s",
+                 RBG_INSPECT(CLASS_OF(self)));
+    }
+
     rb_scan_args(argc, argv, "01", &params_hash);
 
     if (!NIL_P(params_hash))

data/ext/glib2/rbgobj_strv.c

@@ -21,8 +21,6 @@
 
 #include "rbgprivate.h"
 
-#if GLIB_CHECK_VERSION(2,6,0)
-
 static VALUE
 strv_to_ruby(const GValue *from)
 {
@@ -44,5 +42,3 @@ Init_gobject_gstrv(void)
     rbgobj_register_g2r_func(G_TYPE_STRV, strv_to_ruby);
     rbgobj_register_r2g_func(G_TYPE_STRV, strv_from_ruby);
 }
-
-#endif

data/ext/glib2/rbgobj_typeinterface.c

@@ -35,8 +35,6 @@ rg_append_features(G_GNUC_UNUSED VALUE self, VALUE klass)
     return rb_call_super(1, &klass);
 }
 
-#if GLIB_CHECK_VERSION(2,4,0)
-
 static VALUE
 rg_install_property(VALUE self, VALUE pspec_obj)
 {
@@ -122,8 +120,6 @@ rg_properties(int argc, VALUE* argv, VALUE self)
     return ary;
 }
 
-#endif
-
 void
 rbgobj_init_interface(VALUE interf)
 {
@@ -145,11 +141,9 @@ Init_gobject_typeinterface(void)
     RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "MetaInterface");
     rbg_define_method(RG_TARGET_NAMESPACE, "gtype", generic_s_gtype, 0);
     RG_DEF_METHOD(append_features, 1);
-#if GLIB_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(install_property, 1);
     RG_DEF_METHOD(property, 1);
     RG_DEF_METHOD(properties, -1);
-#endif
 
     rbgobj_mInterface = G_DEF_INTERFACE(G_TYPE_INTERFACE, "Interface", mGLib);
 }

data/ext/glib2/rbgobj_value.c

@@ -367,6 +367,17 @@ rg_value(VALUE self)
     return GVAL2RVAL(value);
 }
 
+static VALUE
+rg_to_s(VALUE self)
+{
+    GValue *value;
+    gchar *string_value;
+
+    value = _SELF(self);
+    string_value = g_strdup_value_contents(value);
+    return CSTR2RVAL_FREE(string_value);
+}
+
 void
 Init_gobject_gvalue(void)
 {
@@ -380,4 +391,5 @@ Init_gobject_gvalue(void)
     RG_DEF_METHOD(initialize, 2);
     RG_DEF_METHOD(type, 0);
     RG_DEF_METHOD(value, 0);
+    RG_DEF_METHOD(to_s, 0);
 }

data/ext/glib2/rbgobject.c

@@ -149,25 +149,31 @@ rbgobj_ruby_object_from_instance2(gpointer instance, gboolean alloc)
     }
 }
 
+void
+rbgobj_instance_unref(gpointer instance)
+{
+    GType type;
+
+    type = G_TYPE_FROM_INSTANCE(instance);
+    if (!rbgobj_convert_unref(type, instance)) {
+        type = G_TYPE_FUNDAMENTAL(type);
+        switch (type) {
+          case G_TYPE_OBJECT:
+            g_object_unref(instance);
+            break;
+          default:
+            rbgobj_convert_unref(type, instance);
+            break;
+        }
+    }
+}
+
 VALUE
 rbgobj_ruby_object_from_instance_with_unref(gpointer instance)
 {
     VALUE result = rbgobj_ruby_object_from_instance(instance);
     if (!NIL_P(result)) {
-        GType type;
-
-        type = G_TYPE_FROM_INSTANCE(instance);
-        if (!rbgobj_convert_unref(type, instance)) {
-            type = G_TYPE_FUNDAMENTAL(type);
-            switch (type) {
-              case G_TYPE_OBJECT:
-                g_object_unref(instance);
-                break;
-              default:
-                rbgobj_convert_unref(type, instance);
-                break;
-            }
-        }
+        rbgobj_instance_unref(instance);
     }
     return result;
 }
@@ -265,11 +271,9 @@ rbgobj_define_property_accessors(VALUE klass)
     gtype = CLASS2GTYPE(klass);
 
     if (G_TYPE_IS_INTERFACE(gtype)){
-#if GLIB_CHECK_VERSION(2,4,0)
         gpointer iface = g_type_default_interface_ref(gtype);
         pspecs = g_object_interface_list_properties(iface, &n_properties);
         g_type_default_interface_unref(iface);
-#endif
     } else {
         GObjectClass* oclass = G_OBJECT_CLASS(g_type_class_ref(gtype));
         pspecs = g_object_class_list_properties(oclass, &n_properties);
@@ -369,9 +373,7 @@ Init_gobject(void)
     Init_gobject_gvalue();
     Init_gobject_gvaluetypes();
     Init_gobject_gboxed();
-#if GLIB_CHECK_VERSION(2,6,0)
     Init_gobject_gstrv();
-#endif
     Init_gobject_value_array();
     Init_gobject_genumflags();
     Init_gobject_gparam();