glib2 0.90.2 → 0.90.3

data/ChangeLog

@@ -1,3 +1,52 @@
+2010-10-23  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/glib2.def: add missing exported symbols.
+
+	* lib/mkmf-gnome2.rb: ignore nonexistent directory.
+
+	* ext/glib2/rbglib.c, ext/glib2/rbglib.h:
+	fix alived string may be GCed in RVAL2CSTR and
+	RVAL2CSTR_ACCEPT_NIL problem.
+	Suggested by Neil Roberts. Thanks!!!
+
+2010-10-21  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbgobj_paramspecs.c: add missing type declarations.
+	Reported by Nobuyoshi Nakada. Thanks!!!
+
+2010-10-08  Guillaume Cottenceau
+
+	* fix some uses of rb_str_new* and StringValuePtr to use
+	encoding-aware Strings
+
+2010-10-08  Guillaume Cottenceau
+
+	* RVAL2CSTR2 is deprecated, replace with RVAL2CSTR_ACCEPT_NIL
+
+	* CSTR2RVAL2 is deprecated, replace with CSTR2RVAL_FREE
+
+2010-10-07  Guillaume Cottenceau
+
+	* ext/glib2/rbglib.c, ext/glib2/rbglib.h, ext/glib2/glib2.def,
+	ext/glib2/rbglib_bookmarkfile.c: have RVAL2CSTRFILENAME,
+	CSTRFILENAME2RVAL_FREE and CSTRFILENAMEARRAY2RVAL_FREE, to handle
+	filename String to/from rg2 manipulations, in glib2 to use them in
+	any rg2 submodules
+
+2010-10-06  Guillaume Cottenceau
+
+	* ext/glib2/rbglib.c, ext/glib2/extconf.rb: use
+	HAVE_RUBY_ENCODING_H, not HAVE_RB_STR_ENCODE
+
+2010-09-30  Guillaume Cottenceau
+
+	* ext/glib2/rbglib.c, ext/glib2/rbgobj_value.c,
+	ext/glib2/rbglib.h, ext/glib2/glib2.def: improve CSTR2RVAL,
+	RVAL2CSTR, gvalue2rvalue, and rvalue2gvalue, to use UTF-8 strings
+	when Ruby supports String encoding (Ruby 1.9) - in particular this
+	should allow retrieving usable Strings from rg2 (Strings with a
+	set encoding)
+
 2010-09-26  Kouhei Sutou  <kou@cozmixng.org>
 
 	* ext/glib2/rbglib.h: 0.90.2 -> 0.90.3.

data/Rakefile

@@ -35,6 +35,7 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.extensions = FileList["ext/#{package_name}/extconf.rb"]
   s.require_paths = ["lib"]
+  s.add_development_dependency("pkg-config", ">= 0")
   s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
                      "lib/**/*.rb", "{ext,sample,test,test-unit}/**/*"]
 end

data/ext/glib2/depend

@@ -6,5 +6,7 @@ install-so:
 	$(INSTALL_DATA) glib-enum-types.h $(RUBYARCHDIR)
 
 install:
-	$(MAKEDIRS) $(libdir)/pkgconfig
-	$(INSTALL_DATA) ruby-glib2.pc $(libdir)/pkgconfig
+	if test -n "$(pkgconfigdir)"; then			\
+	  $(MAKEDIRS) $(pkgconfigdir);				\
+	  $(INSTALL_DATA) ruby-glib2.pc $(pkgconfigdir);	\
+	fi

data/ext/glib2/extconf.rb

@@ -37,7 +37,6 @@ have_func("rb_sourceline", ruby_header)
 have_func("ruby_set_current_source", ruby_header)
 have_func("rb_thread_blocking_region", ruby_header)
 have_func("ruby_native_thread_p", ruby_header)
-have_func("rb_str_encode", ruby_header)
 
 have_var("curr_thread", [ruby_header, "node.h"])
 have_var("rb_curr_thread", [ruby_header, "node.h"])

data/ext/glib2/glib2.def

@@ -56,9 +56,13 @@ EXPORTS
 	g_value_set_ruby_value
 	g_key_file_get_type
 	rbg_rval_inspect
+	rbg_rval2cstr
 	rbg_rval2cstr_accept_nil
 	rbg_cstr2rval
 	rbg_cstr2rval_with_free
+        rbg_filename_to_ruby_free
+        rbg_filename_from_ruby
+        rbg_filename_gslist_to_array_free
 	rbg_string_value_ptr
 	rbgutil_id_module_eval		DATA
 	rbgutil_def_setters
@@ -85,5 +89,10 @@ EXPORTS
 	rbgobj_fund_define_fundamental
 	rbgobj_gc_mark_gvalue
 	rbgobj_gc_mark_instance
+	rbglib_num_to_uint64
+	rbglib_uint64_to_num
+	rbglib_num_to_int64
+	rbglib_int64_to_num
 
 	g_connect_flags_get_type
+	g_poll_fd_get_type

data/ext/glib2/rbglib.c

@@ -43,6 +43,18 @@ extern void Init_glib_unicode();
 extern void Init_glib_keyfile();
 extern void Init_glib_bookmark_file();
 
+gchar *
+rbg_rval2cstr(VALUE *str)
+{
+    StringValue(*str);
+#ifdef HAVE_RUBY_ENCODING_H
+    if (rb_enc_get(*str) != rb_utf8_encoding()) {
+        str = rb_str_export_to_enc(*str, rb_utf8_encoding());
+    }
+#endif
+    return RSTRING_PTR(*str);
+}
+
 const gchar *
 rbg_rval_inspect(VALUE object)
 {
@@ -60,21 +72,29 @@ rbg_string_value_ptr(ptr)
 }
 
 gchar *
-rbg_rval2cstr_accept_nil(VALUE str)
+rbg_rval2cstr_accept_nil(VALUE *str)
 {
-    return NIL_P(str) ? NULL : StringValuePtr(str);
+    return NIL_P(*str) ? NULL : RVAL2CSTR(*str);
 }
 
 VALUE
 rbg_cstr2rval(const char* str)
 {
+#ifdef HAVE_RUBY_ENCODING_H
+    return str ? rb_external_str_new_with_enc(str, strlen(str), rb_utf8_encoding()) : Qnil;
+#else
     return str ? rb_str_new2(str) : Qnil;
+#endif
 }
 
 static VALUE
 rbg_cstr2rval_with_free_body(VALUE str)
 {
+#ifdef HAVE_RUBY_ENCODING_H
+    return rb_external_str_new_with_enc((gchar *)str, strlen((gchar *)str), rb_utf8_encoding());
+#else
     return rb_str_new2((gchar *)str);
+#endif
 }
 
 static VALUE
@@ -92,6 +112,94 @@ rbg_cstr2rval_with_free(gchar *str)
                            rbg_cstr2rval_with_free_ensure, (VALUE)str) : Qnil;
 }
 
+#ifdef HAVE_RUBY_ENCODING_H
+static rb_encoding *filename_encoding_if_not_utf8;
+#endif
+
+VALUE
+rbg_filename_to_ruby_free(gchar *filename)
+{
+#ifdef HAVE_RUBY_ENCODING_H
+    gchar *filename_utf8;
+    GError *error = NULL;
+    gsize written;
+    VALUE rb_filename = Qnil;
+
+    if (filename == NULL)
+        return Qnil;
+       
+    /* convert filename to UTF-8 if needed */
+    if (filename_encoding_if_not_utf8 != NULL) {
+        filename_utf8 = g_filename_to_utf8(filename, -1, NULL, &written, &error);
+        g_free(filename);
+        if (error != NULL)
+            RAISE_GERROR(error);
+    } else {
+        filename_utf8 = filename;
+    }
+
+    /* create Ruby String in UTF-8 */
+    rb_filename = rb_external_str_new_with_enc(filename_utf8,
+                                               strlen(filename_utf8),
+                                               rb_utf8_encoding());
+    g_free(filename_utf8);
+
+    /* if needed, change encoding of Ruby String to filename encoding, so that
+       upcoming File operations will work properly */
+    if (filename_encoding_if_not_utf8 != NULL) {
+        return rb_str_export_to_enc(rb_filename, filename_encoding_if_not_utf8);
+    } else {
+        return rb_filename;
+    }
+
+#else
+    return CSTR2RVAL_FREE(filename);
+#endif
+}
+
+gchar *
+rbg_filename_from_ruby(VALUE filename)
+{
+#ifdef HAVE_RUBY_ENCODING_H
+    GError *error = NULL;
+    gchar *retval;
+    gsize written;
+
+    /* if needed, change encoding of Ruby String to UTF-8 */
+    StringValue(filename);
+    if (rb_enc_get(filename) != rb_utf8_encoding()) {
+        filename = rb_str_export_to_enc(filename, rb_utf8_encoding());
+    }
+
+    /* convert it to filename encoding if needed */
+    if (filename_encoding_if_not_utf8 != NULL) {
+        retval = g_filename_from_utf8(RSTRING_PTR(filename), -1, NULL, &written, &error);
+        if (error != NULL)
+            RAISE_GERROR(error);
+    } else {
+        retval = RSTRING_PTR(filename);
+    }
+
+    return retval;
+
+#else
+    return RVAL2CSTR(filename);
+#endif
+}
+
+VALUE
+rbg_filename_gslist_to_array_free(GSList *list)
+{
+    GSList *l;
+    VALUE ary = rb_ary_new();
+    for (l = list; l != NULL; l = g_slist_next(l)) {
+        rb_ary_push(ary, rbg_filename_to_ruby_free(l->data));
+    }
+    g_slist_free(list);
+    return ary;
+}
+
+
 #if 0
 /*
 2004-04-15 Commented out by Masao.
@@ -175,6 +283,10 @@ rbg_s_os_unix(self)
 void 
 Init_glib2()
 {
+#ifdef HAVE_RUBY_ENCODING_H
+    const gchar **filename_charsets;
+#endif
+
     id_inspect = rb_intern("inspect");
 
     mGLib = rb_define_module("GLib");
@@ -254,6 +366,21 @@ Init_glib2()
     rb_define_const(mGLib, "DIR_SEPARATOR", CSTR2RVAL(G_DIR_SEPARATOR_S));
     rb_define_const(mGLib, "SEARCHPATH_SEPARATOR", CSTR2RVAL(G_SEARCHPATH_SEPARATOR_S));
 
+    /* discover and store glib filename encoding */
+#ifdef HAVE_RUBY_ENCODING_H
+    if (g_get_filename_charsets(&filename_charsets)
+        || filename_charsets == NULL
+        || filename_charsets[0] == NULL
+        || !strcmp(filename_charsets[0], "UTF-8")
+        || rb_enc_find(filename_charsets[0]) == rb_enc_find("ASCII-8BIT")) {
+        /* set to NULL, mean do not perform transcoding, either filename
+           encoding is unknown, UTF-8, or unsupported */
+        filename_encoding_if_not_utf8 = NULL;
+    } else {
+        filename_encoding_if_not_utf8 = rb_enc_find(filename_charsets[0]);
+    }
+#endif
+
 /* Don't implement them.
 #define     G_DIR_SEPARATOR_S
 #define     G_IS_DIR_SEPARATOR              (c)

data/ext/glib2/rbglib.h

@@ -23,7 +23,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 0
 #define RBGLIB_MINOR_VERSION 90
-#define RBGLIB_MICRO_VERSION 2
+#define RBGLIB_MICRO_VERSION 3
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -45,13 +45,17 @@ typedef int GPid;
 
 #define RBG_INSPECT(object) (rbg_rval_inspect(object))
 
-#define RVAL2CSTR(v) (StringValuePtr(v))
-#define RVAL2CSTR_ACCEPT_NIL(v) (rbg_rval2cstr_accept_nil(v))
+#define RVAL2CSTR(v) (rbg_rval2cstr(&v))
+#define RVAL2CSTR_ACCEPT_NIL(v) (rbg_rval2cstr_accept_nil(&v))
 #define RVAL2CSTR2(v) (RVAL2CSTR_ACCEPT_NIL(v))
 #define CSTR2RVAL(s) (rbg_cstr2rval(s))
 #define CSTR2RVAL_FREE(s) (rbg_cstr2rval_with_free(s))
 #define CSTR2RVAL2(s) (CSTR2RVAL_FREE(s))
 
+#define RVAL2CSTRFILENAME(v) (rbg_filename_from_ruby(v))
+#define CSTRFILENAME2RVAL_FREE(s) (rbg_filename_to_ruby_free(s))
+#define CSTRFILENAMEARRAY2RVAL_FREE(s) (rbg_filename_gslist_to_array_free(s))
+
 #define CBOOL2RVAL(b)   ((b) ? Qtrue : Qfalse)
 #define RVAL2CBOOL(b)   (RTEST(b))
 #define GERROR2RVAL(error) (rbgerr_gerror2exception(error))
@@ -76,10 +80,15 @@ RUBY_GLIB2_VAR VALUE mGLib;
 extern const gchar *rbg_rval_inspect(VALUE object);
 
 extern gchar* rbg_string_value_ptr(volatile VALUE* ptr); /* no longer used */
-extern gchar *rbg_rval2cstr_accept_nil(VALUE str);
+extern gchar *rbg_rval2cstr(VALUE *str);
+extern gchar *rbg_rval2cstr_accept_nil(VALUE *str);
 extern VALUE rbg_cstr2rval(const char* str);
 extern VALUE rbg_cstr2rval_with_free(gchar* str);
 
+extern VALUE rbg_filename_to_ruby_free(gchar *filename);
+extern gchar *rbg_filename_from_ruby(VALUE filename);
+extern VALUE rbg_filename_gslist_to_array_free(GSList *list);
+
 /* rbgerror.h */
 extern VALUE rbgerr_gerror2exception(GError *error);
 extern VALUE rbgerr_define_gerror(GQuark domain, const gchar* name, VALUE module, VALUE parent, VALUE gtype);

data/ext/glib2/rbglib_bookmarkfile.c

@@ -56,7 +56,7 @@ bf_load_from_file(self, filename)
 {
     GError* error = NULL;
     gboolean ret = g_bookmark_file_load_from_file(_SELF(self),
-                                                  (const gchar*)RVAL2CSTR(filename),
+                                                  RVAL2CSTRFILENAME(filename),
                                                   &error);
     if (!ret) RAISE_GERROR(error);
     return self;
@@ -98,17 +98,12 @@ static VALUE
 bf_to_data(self)
     VALUE self;
 {
-    VALUE ret;
-    gsize len;
     GError* error = NULL;
-    gchar* data = g_bookmark_file_to_data(_SELF(self), &len, &error);
+    gchar* data = g_bookmark_file_to_data(_SELF(self), NULL, &error);
 
     if (error) RAISE_GERROR(error);
     
-    ret = rb_str_new(data, len);
-    g_free(data);
-    
-    return ret;
+    return CSTR2RVAL_FREE(data);
 }
 
 static VALUE
@@ -117,7 +112,7 @@ bf_to_file(self, filename)
 {
     GError* error = NULL;
     gboolean ret = g_bookmark_file_to_file(_SELF(self),
-                                           (const gchar *)RVAL2CSTR(filename),
+                                           RVAL2CSTRFILENAME(filename),
                                            &error);
     if (!ret) RAISE_GERROR(error);
     return self;
@@ -187,7 +182,7 @@ bf_get_title(self, uri)
                                            (const gchar *)RVAL2CSTR(uri),
                                            &error);
     if (error) RAISE_GERROR(error);
-    return CSTR2RVAL2(ret);
+    return CSTR2RVAL_FREE(ret);
 }
 
 static VALUE
@@ -199,7 +194,7 @@ bf_get_description(self, uri)
                                                  (const gchar *)RVAL2CSTR(uri),
                                                  &error);
     if (error) RAISE_GERROR(error);
-    return CSTR2RVAL2(ret);
+    return CSTR2RVAL_FREE(ret);
 }
 
 static VALUE
@@ -211,7 +206,7 @@ bf_get_mime_type(self, uri)
                                                (const gchar *)RVAL2CSTR(uri),
                                                &error);
     if (error) RAISE_GERROR(error);
-    return CSTR2RVAL2(ret);
+    return CSTR2RVAL_FREE(ret);
 }
 
 static VALUE
@@ -241,7 +236,7 @@ bf_get_icon(self, uri)
         if (error) RAISE_GERROR(error);
         return Qnil;
     }
-    return rb_assoc_new(CSTR2RVAL2(href), CSTR2RVAL2(mime_type)); 
+    return rb_assoc_new(CSTR2RVAL_FREE(href), CSTR2RVAL_FREE(mime_type)); 
 }
 
 static VALUE

data/ext/glib2/rbglib_keyfile.c

@@ -192,13 +192,12 @@ static VALUE
 keyfile_to_data(self)
     VALUE self;
 {
-    gsize length;
     GError* error = NULL;
-    gchar* data = g_key_file_to_data(_SELF(self), &length, &error);
+    gchar* data = g_key_file_to_data(_SELF(self), NULL, &error);
 
     if (error) RAISE_GERROR(error);
 
-    return rb_str_new(data, length);
+    return CSTR2RVAL_FREE(data);
 }
 
 static VALUE
@@ -284,7 +283,7 @@ keyfile_get_value(self, group_name, key)
 
     if (error) RAISE_GERROR(error);
 
-    return ret ? CSTR2RVAL2(ret) : Qnil;
+    return CSTR2RVAL_FREE(ret);
 }
 
 static VALUE
@@ -299,7 +298,7 @@ keyfile_get_string(self, group_name, key)
 
     if (error) RAISE_GERROR(error);
 
-    return ret ? CSTR2RVAL2(ret) : Qnil;
+    return CSTR2RVAL_FREE(ret);
 }
 
 static VALUE
@@ -322,7 +321,7 @@ keyfile_get_locale_string(argc, argv, self)
 
     if (error) RAISE_GERROR(error);
 
-    return ret ? CSTR2RVAL2(ret) : Qnil;
+    return CSTR2RVAL_FREE(ret);
 }
 
 static VALUE
@@ -508,7 +507,7 @@ keyfile_get_comment(self, group_name, key)
     
     if (error) RAISE_GERROR(error);
 
-    return CSTR2RVAL2(ret);
+    return CSTR2RVAL_FREE(ret);
 }
 
 static VALUE

data/ext/glib2/rbglib_shell.c

@@ -37,7 +37,7 @@ static VALUE
 shell_quote(self, unquoted_string)
     VALUE self, unquoted_string;
 {
-    return CSTR2RVAL2(g_shell_quote((const gchar*)RVAL2CSTR(unquoted_string)));
+    return CSTR2RVAL_FREE(g_shell_quote((const gchar*)RVAL2CSTR(unquoted_string)));
 }
 
 static VALUE
@@ -49,7 +49,7 @@ shell_unquote(self, quoted_string)
 
     if (! str) RAISE_GERROR(err);
 
-    return CSTR2RVAL2(str);
+    return CSTR2RVAL_FREE(str);
 }
 
 void

data/ext/glib2/rbglib_spawn.c

@@ -241,7 +241,7 @@ rbglib_m_spawn_command_line_sync(self, str)
     VALUE std_out, std_err;
     gboolean ret;
 
-    command_line = StringValuePtr(str);
+    command_line = RVAL2CSTR(str);
     ret = g_spawn_command_line_sync(command_line,
                                                &standard_output,
                                                &standard_error,

data/ext/glib2/rbglib_utils.c

@@ -83,7 +83,7 @@ rbglib_m_listenv(self)
     c_list = g_listenv();
     c_var = c_list;
     while(*c_var) {
-        rb_ary_push(r_list, rb_str_new2(*(c_var++)));
+        rb_ary_push(r_list, CSTR2RVAL(*(c_var++)));
     }
     g_strfreev(c_list);
     return r_list;

data/ext/glib2/rbglib_win32.c

@@ -19,14 +19,14 @@ static VALUE
 rbglib_m_win32_error_message(self, error)
     VALUE self, error;
 {
-    return CSTR2RVAL2(g_win32_error_message(NUM2INT(error)));
+    return CSTR2RVAL_FREE(g_win32_error_message(NUM2INT(error)));
 }
 
 static VALUE
 rbglib_m_win32_locale(self)
     VALUE self;
 {
-    return CSTR2RVAL2(g_win32_getlocale());
+    return CSTR2RVAL_FREE(g_win32_getlocale());
 }
 
 static VALUE
@@ -41,7 +41,7 @@ static VALUE
 rbglib_m_win32_get_package_installation_directory(self, package, dll_name)
   VALUE self, package, dll_name;
 {
-	return CSTR2RVAL2(g_win32_get_package_installation_directory(RVAL2CSTR(package), 
+	return CSTR2RVAL_FREE(g_win32_get_package_installation_directory(RVAL2CSTR(package), 
 	                                                            RVAL2CSTR(dll_name)));
 }
 
@@ -49,7 +49,7 @@ static VALUE
 rbglib_m_get_package_installation_subdirectory(self, package, dll_name, subdir)
   VALUE self, package, dll_name, subdir;
 {
-	return CSTR2RVAL2(g_win32_get_package_installation_subdirectory(RVAL2CSTR(package), 
+	return CSTR2RVAL_FREE(g_win32_get_package_installation_subdirectory(RVAL2CSTR(package), 
 	                                                                RVAL2CSTR(dll_name),
 	                                                                RVAL2CSTR(subdir)));
 }
@@ -68,7 +68,7 @@ static VALUE
 rbglib_m_win32_locale_filename_from_utf8(self, utf8_filename)
     VALUE self, utf8_filename;
 {
-    return CSTR2RVAL2(g_win32_locale_filename_from_utf8(RVAL2CSTR(utf8_filename)));
+    return CSTR2RVAL_FREE(g_win32_locale_filename_from_utf8(RVAL2CSTR(utf8_filename)));
 }
 
 static VALUE

data/ext/glib2/rbgobj_paramspecs.c

@@ -15,39 +15,40 @@
 #include "rbgprivate.h"
 
 #define DEF_NUMERIC_PSPEC_METHODS_FUNC(pspec_type, typename, from_ruby, to_ruby, pspec_cast) \
-static VALUE \
-typename##_initialize(self, name, nick, blurb, minimum, maximum, default_value, flags) \
-   VALUE self, name, nick, blurb, minimum, maximum, default_value, flags; \
-{ \
-    GParamSpec* pspec; \
-    pspec = g_param_spec_##typename(StringValuePtr(name), \
-                                    StringValuePtr(nick), \
-                                    StringValuePtr(blurb), \
-                                    from_ruby(minimum), \
-                                    from_ruby(maximum), \
-                                    from_ruby(default_value), \
-                                    NUM2UINT(flags)); \
-    rbgobj_param_spec_initialize(self, pspec); \
-    return Qnil; \
-} \
-\
-static \
-VALUE typename##_minimum(self) \
-{ \
-    return to_ruby(pspec_cast(RVAL2GOBJ(self))->minimum); \
-} \
-\
-static \
-VALUE typename##_maximum(self) \
-{ \
-    return to_ruby(pspec_cast(RVAL2GOBJ(self))->maximum); \
-} \
-\
-static \
-VALUE typename##_range(self) \
-{ \
-    pspec_type* pspec = pspec_cast(RVAL2GOBJ(self)); \
-    return rb_range_new(pspec->minimum, pspec->maximum, 0); \
+static VALUE                                                            \
+typename##_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,  \
+                      VALUE minimum, VALUE maximum, VALUE default_value, \
+                      VALUE flags)                                      \
+{                                                                       \
+    GParamSpec* pspec;                                                  \
+    pspec = g_param_spec_##typename(StringValuePtr(name),               \
+                                    StringValuePtr(nick),               \
+                                    StringValuePtr(blurb),              \
+                                    from_ruby(minimum),                 \
+                                    from_ruby(maximum),                 \
+                                    from_ruby(default_value),           \
+                                    NUM2UINT(flags));                   \
+    rbgobj_param_spec_initialize(self, pspec);                          \
+    return Qnil;                                                        \
+}                                                                       \
+                                                                        \
+static VALUE                                                            \
+typename##_minimum(VALUE self)                                          \
+{                                                                       \
+    return to_ruby(pspec_cast(RVAL2GOBJ(self))->minimum);               \
+}                                                                       \
+                                                                        \
+static VALUE                                                            \
+typename##_maximum(VALUE self)                                          \
+{                                                                       \
+    return to_ruby(pspec_cast(RVAL2GOBJ(self))->maximum);               \
+}                                                                       \
+                                                                        \
+static VALUE                                                            \
+typename##_range(VALUE self)                                            \
+{                                                                       \
+    pspec_type* pspec = pspec_cast(RVAL2GOBJ(self));                    \
+    return rb_range_new(pspec->minimum, pspec->maximum, 0);             \
 }
 
 DEF_NUMERIC_PSPEC_METHODS_FUNC(GParamSpecChar, char, NUM2INT, INT2FIX, G_PARAM_SPEC_CHAR)
@@ -62,23 +63,21 @@ DEF_NUMERIC_PSPEC_METHODS_FUNC(GParamSpecFloat, float, NUM2DBL, rb_float_new, G_
 DEF_NUMERIC_PSPEC_METHODS_FUNC(GParamSpecDouble, double, NUM2DBL, rb_float_new, G_PARAM_SPEC_DOUBLE)
 
 static VALUE
-float_epsilon(self)
-    VALUE self;
+float_epsilon(VALUE self)
 {
     return rb_float_new(G_PARAM_SPEC_FLOAT(RVAL2GOBJ(self))->epsilon);
 }
 
 static VALUE
-double_epsilon(self)
-    VALUE self;
+double_epsilon(VALUE self)
 {
     return rb_float_new(G_PARAM_SPEC_DOUBLE(RVAL2GOBJ(self))->epsilon);
 }
 
 
 static VALUE
-boolean_initialize(self, name, nick, blurb, default_value, flags)
-   VALUE self, name, nick, blurb, default_value, flags;
+boolean_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
+                   VALUE default_value, VALUE flags)
 {
     GParamSpec* pspec;
     pspec = g_param_spec_boolean(StringValuePtr(name),
@@ -91,8 +90,8 @@ boolean_initialize(self, name, nick, blurb, default_value, flags)
 }
 
 static VALUE
-unichar_initialize(self, name, nick, blurb, default_value, flags)
-   VALUE self, name, nick, blurb, default_value, flags;
+unichar_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
+                   VALUE default_value, VALUE flags)
 {
     GParamSpec* pspec;
     pspec = g_param_spec_unichar(StringValuePtr(name),
@@ -105,8 +104,8 @@ unichar_initialize(self, name, nick, blurb, default_value, flags)
 }
 
 static VALUE
-enum_initialize(self, name, nick, blurb, enum_type, default_value, flags)
-   VALUE self, name, nick, blurb, enum_type, default_value, flags;
+enum_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
+                VALUE enum_type, VALUE default_value, VALUE flags)
 {
     GParamSpec* pspec;
     GType gtype = rbgobj_gtype_get(enum_type);
@@ -122,8 +121,8 @@ enum_initialize(self, name, nick, blurb, enum_type, default_value, flags)
 }
 
 static VALUE
-flags_initialize(self, name, nick, blurb, flags_type, default_value, flags)
-   VALUE self, name, nick, blurb, flags_type, default_value, flags;
+flags_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
+                 VALUE flags_type, VALUE default_value, VALUE flags)
 {
     GParamSpec* pspec;
     GType gtype = rbgobj_gtype_get(flags_type);
@@ -139,8 +138,8 @@ flags_initialize(self, name, nick, blurb, flags_type, default_value, flags)
 }
 
 static VALUE
-string_initialize(self, name, nick, blurb, default_value, flags)
-   VALUE self, name, nick, blurb, default_value, flags;
+string_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
+                  VALUE default_value, VALUE flags)
 {
     GParamSpec* pspec;
     pspec = g_param_spec_string(StringValuePtr(name),
@@ -153,8 +152,8 @@ string_initialize(self, name, nick, blurb, default_value, flags)
 }
 
 static VALUE
-param_initialize(self, name, nick, blurb, param_type, flags)
-   VALUE self, name, nick, blurb, param_type, flags;
+param_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
+                 VALUE param_type, VALUE flags)
 {
     GParamSpec* pspec;
     pspec = g_param_spec_param(StringValuePtr(name),
@@ -167,8 +166,8 @@ param_initialize(self, name, nick, blurb, param_type, flags)
 }
 
 static VALUE
-boxed_initialize(self, name, nick, blurb, boxed_type, flags)
-   VALUE self, name, nick, blurb, boxed_type, flags;
+boxed_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
+                 VALUE boxed_type, VALUE flags)
 {
     GParamSpec* pspec;
     pspec = g_param_spec_boxed(StringValuePtr(name),
@@ -181,8 +180,7 @@ boxed_initialize(self, name, nick, blurb, boxed_type, flags)
 }
 
 static VALUE
-pointer_initialize(self, name, nick, blurb, flags)
-   VALUE self, name, nick, blurb, flags;
+pointer_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb, VALUE flags)
 {
     GParamSpec* pspec;
     pspec = g_param_spec_pointer(StringValuePtr(name),
@@ -194,8 +192,8 @@ pointer_initialize(self, name, nick, blurb, flags)
 }
 
 static VALUE
-value_array_initialize(self, name, nick, blurb, element_spec, flags)
-   VALUE self, name, nick, blurb, element_spec, flags;
+value_array_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
+                       VALUE element_spec, VALUE flags)
 {
     GParamSpec* pspec;
     pspec = g_param_spec_value_array(StringValuePtr(name),
@@ -208,8 +206,8 @@ value_array_initialize(self, name, nick, blurb, element_spec, flags)
 }
 
 static VALUE
-object_initialize(self, name, nick, blurb, object_type, flags)
-   VALUE self, name, nick, blurb, object_type, flags;
+object_initialize(VALUE self, VALUE name, VALUE nick, VALUE blurb,
+                  VALUE object_type, VALUE flags)
 {
     GParamSpec* pspec;
     pspec = g_param_spec_object(StringValuePtr(name),
@@ -222,7 +220,7 @@ object_initialize(self, name, nick, blurb, object_type, flags)
 }
 
 void
-Init_gobject_gparamspecs()
+Init_gobject_gparamspecs(void)
 {
     VALUE cParamSpec = GTYPE2CLASS(G_TYPE_PARAM);
     VALUE c;

data/ext/glib2/rbgobj_value.c

@@ -72,10 +72,7 @@ rbgobj_gvalue_to_rvalue(const GValue* value)
       case G_TYPE_DOUBLE:
         return rb_float_new(g_value_get_double(value));
       case G_TYPE_STRING:
-        {
-            const char* str = g_value_get_string(value);
-            return str ? rb_str_new2(str) : Qnil;
-        }
+        return CSTR2RVAL(g_value_get_string(value));
       case G_TYPE_ENUM:
         return rbgobj_make_enum(g_value_get_enum(value), type);
       case G_TYPE_FLAGS:
@@ -249,7 +246,7 @@ rbgobj_rvalue_to_gvalue(VALUE val, GValue* result)
         {
             if (SYMBOL_P(val))
                 val = rb_funcall(val, id_to_s, 0);
-            g_value_set_string(result, NIL_P(val) ? NULL : StringValuePtr(val));
+            g_value_set_string(result, RVAL2CSTR_ACCEPT_NIL(val));
             return;
         }
       case G_TYPE_OBJECT:

data/ext/glib2/rbgutil.c

@@ -298,7 +298,7 @@ rbgutil_generic_gtype(VALUE self)
 VALUE
 rbgutil_string_set_utf8_encoding(VALUE string)
 {
-#ifdef HAVE_RB_STR_ENCODE
+#ifdef HAVE_RUBY_ENCODING_H
     if (!NIL_P(string))
         rb_enc_associate(string, rb_utf8_encoding());
 #endif

data/lib/mkmf-gnome2.rb

@@ -90,6 +90,7 @@ def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
     unless File.exist?(target_build_dir_full_path)
       target_build_dir_full_path = File.join(topdir, target_srcdir)
     end
+    next unless File.exist?(target_build_dir_full_path)
     $INCFLAGS = "-I#{target_build_dir_full_path} #{$INCFLAGS}"
 
     if /cygwin|mingw/ =~ RUBY_PLATFORM

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glib2
 version: !ruby/object:Gem::Version 
-  hash: 371
+  hash: 369
   prerelease: false
   segments: 
   - 0
   - 90
-  - 2
-  version: 0.90.2
+  - 3
+  version: 0.90.3
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,10 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 +09:00
+date: 2010-10-23 00:00:00 +09:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: pkg-config
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []