glib2 0.90.7 → 0.90.8

data/ChangeLog

@@ -1,5 +1,73 @@
+2011-03-04  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbglib_win32.c
+	(rbglib_m_win32_locale_filename_from_utf8_deprecated): add missing
+	argument.
+
+2011-03-03  Vincent Carmona
+
+	* glib2/lib/mkmf-gnome2.rb: clean pkg-config files.
+
+2011-02-25  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbgobject.h, ext/glib2/rbgprivate.h
+	(rbgobj_gobject_initialize): export.
+
+	* ext/glib2/rbgobject.c (rbgobj_initialize_object): add missing break.
+
+2011-02-13  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/test_iochannel.rb: work on both Ruby 1.8 and 1.9.
+
+	* test/test_iochannel.rb: don't set $KCODE on Ruby 1.9.
+
+	* ext/glib2/rbglib_iochannel.c: set encoding.
+
+	* ext/glib2/rbglib.c (rbg_cstr2rval_len_with_encoding): use UTF-8
+	as the default encoding.
+
+	* ext/glib2/rbglib.h: fix a typo.
+
+	* ext/glib2/rbglib_unicode.c: use CSTR2RVAL_ENC() and
+	CSTR2RVAL_LEN_ENC().
+
+	* ext/glib2/rbglib.[ch] (CSTR2RVAL_ENC, CSTR2RVAL_LEN_ENC): add.
+
+	* ext/glib2/rbglib_unicode.c, test/test_unicode.rb: set UTF-16 and
+	UTF-32 encoding.
+
+	* ext/glib2/rbglib.c (rbg_cstr2rval_len): use len.
+
+	* ext/glib2/rbglib_unicode.c: set UTF-8 encoding.
+
+	* test/test_unicode.rb: don't require Uconv on Ruby 1.9.
+
+	* ext/glib2/rbglib.[ch] (CSTR2RVAL_LEN): add.
+
+	* test/test_unicode.rb (TestGLibUnicode#test_utf8_validate):
+	support Ruby 1.9.
+
+2011-02-12  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/mkmf-gnome2.rb (#check_cairo): re-support non-gem rcairo
+	detection. #3178228
+	Patch by OBATA Akio. Thanks!!!
+
+2011-02-05  Masaaki Aoyagi
+
+	* ext/glib2/*.c: change to ANSI C style.
+
+2011-02-04  Masaaki Aoyagi
+
+	* ext/glib2/rbglib_iochannel.c: fix declaration.
+
 2011-02-02  Kouhei Sutou  <kou@cozmixng.org>
 
+	* lib/gnome2-raketask.rb (GNOME2Package#define_gem_tasks):
+	has_rdoc = false.
+
+	* ext/glib2/rbglib.h: 0.90.7 -> 0.90.8.
+
 	* lib/mkmf-gnome2.rb: remove "-Wl,--no-undefined" linker flag.
 	Reported by Dobai-Pataky Bálint.
 

data/ext/glib2/rbglib.c

@@ -65,8 +65,7 @@ rbg_rval_inspect(VALUE object)
 }
 
 char *
-rbg_string_value_ptr(ptr)
-    volatile VALUE *ptr;
+rbg_string_value_ptr(volatile VALUE *ptr)
 {
     return rb_string_value_ptr(ptr);
 }
@@ -78,25 +77,65 @@ rbg_rval2cstr_accept_nil(VALUE *str)
 }
 
 VALUE
-rbg_cstr2rval(const char* str)
+rbg_cstr2rval(const gchar* str)
 {
+    if (!str)
+        return Qnil;
+
+    return CSTR2RVAL_LEN(str, strlen(str));
+}
+
+VALUE
+rbg_cstr2rval_len(const gchar* str, gsize len)
+{
+    if (!str)
+        return Qnil;
+
 #ifdef HAVE_RUBY_ENCODING_H
-    return str ? rb_external_str_new_with_enc(str, strlen(str), rb_utf8_encoding()) : Qnil;
+    return rb_external_str_new_with_enc(str, len, rb_utf8_encoding());
 #else
-    return str ? rb_str_new2(str) : Qnil;
+    return rb_str_new(str, len);
 #endif
 }
 
-static VALUE
-rbg_cstr2rval_with_free_body(VALUE str)
+VALUE
+rbg_cstr2rval_with_encoding(const gchar* str, const gchar *encoding)
 {
+    if (!str)
+        return Qnil;
+
+    return CSTR2RVAL_LEN_ENC(str, strlen(str), encoding);
+}
+
+VALUE
+rbg_cstr2rval_len_with_encoding(const gchar* str, gsize len,
+                                const gchar *encoding)
+{
+    if (!str)
+        return Qnil;
+
 #ifdef HAVE_RUBY_ENCODING_H
-    return rb_external_str_new_with_enc((gchar *)str, strlen((gchar *)str), rb_utf8_encoding());
+    {
+        rb_encoding *rb_encoding;
+
+        if (encoding) {
+            rb_encoding = rb_enc_find(encoding);
+        } else {
+            rb_encoding = rb_utf8_encoding();
+        }
+        return rb_external_str_new_with_enc(str, len, rb_encoding);
+    }
 #else
-    return rb_str_new2((gchar *)str);
+    return rb_str_new(str, len);
 #endif
 }
 
+static VALUE
+rbg_cstr2rval_with_free_body(VALUE str)
+{
+    return CSTR2RVAL((const gchar *)str);
+}
+
 static VALUE
 rbg_cstr2rval_with_free_ensure(VALUE str)
 {
@@ -248,8 +287,7 @@ Init_mem()
 #endif
 
 static VALUE
-rbg_s_os_win32(self)
-    VALUE self;
+rbg_s_os_win32(VALUE self)
 {
 #ifdef G_OS_WIN32
     return Qtrue;
@@ -259,8 +297,7 @@ rbg_s_os_win32(self)
 }
 
 static VALUE
-rbg_s_os_beos(self)
-    VALUE self;
+rbg_s_os_beos(VALUE self)
 {
 #ifdef G_OS_BEOS
     return Qtrue;
@@ -270,8 +307,7 @@ rbg_s_os_beos(self)
 }
 
 static VALUE
-rbg_s_os_unix(self)
-    VALUE self;
+rbg_s_os_unix(VALUE self)
 {
 #ifdef G_OS_UNIX
     return Qtrue;

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 7
+#define RBGLIB_MICRO_VERSION 8
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -49,6 +49,9 @@ typedef int GPid;
 #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_LEN(s, l) (rbg_cstr2rval_len(s, l))
+#define CSTR2RVAL_ENC(s, e) (rbg_cstr2rval_with_encoding(s, e))
+#define CSTR2RVAL_LEN_ENC(s, l, e) (rbg_cstr2rval_len_with_encoding(s, l, e))
 #define CSTR2RVAL_FREE(s) (rbg_cstr2rval_with_free(s))
 #define CSTR2RVAL2(s) (CSTR2RVAL_FREE(s))
 
@@ -82,7 +85,12 @@ extern const gchar *rbg_rval_inspect(VALUE object);
 extern gchar* rbg_string_value_ptr(volatile VALUE* ptr); /* no longer used */
 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(const gchar* str);
+extern VALUE rbg_cstr2rval_len(const gchar* str, gsize len);
+extern VALUE rbg_cstr2rval_with_encoding(const gchar* str,
+                                         const gchar *encoding);
+extern VALUE rbg_cstr2rval_len_with_encoding(const gchar* str, gsize len,
+                                             const gchar *encoding);
 extern VALUE rbg_cstr2rval_with_free(gchar* str);
 
 extern VALUE rbg_filename_to_ruby_free(gchar *filename);

data/ext/glib2/rbglib_bookmarkfile.c

@@ -43,16 +43,14 @@ g_bookmark_file_get_type(void)
 #define _SELF(self) ((GBookmarkFile*)(RVAL2BOXED(self, G_TYPE_BOOKMARK_FILE)))
 
 static VALUE
-bf_initialize(self)
-    VALUE self;
+bf_initialize(VALUE self)
 {
     G_INITIALIZE(self, g_bookmark_file_new());
     return Qnil;
 }
 
 static VALUE
-bf_load_from_file(self, filename)
-    VALUE self, filename;
+bf_load_from_file(VALUE self, VALUE filename)
 {
     GError* error = NULL;
     gboolean ret = g_bookmark_file_load_from_file(_SELF(self),
@@ -78,8 +76,7 @@ bf_load_from_data(VALUE self, VALUE data)
 }
 
 static VALUE
-bf_load_from_data_dirs(self, file)
-    VALUE self, file;
+bf_load_from_data_dirs(VALUE self, VALUE file)
 {
     GError* error = NULL;
     gboolean ret;
@@ -95,8 +92,7 @@ bf_load_from_data_dirs(self, file)
 }
 
 static VALUE
-bf_to_data(self)
-    VALUE self;
+bf_to_data(VALUE self)
 {
     GError* error = NULL;
     gchar* data = g_bookmark_file_to_data(_SELF(self), NULL, &error);
@@ -107,8 +103,7 @@ bf_to_data(self)
 }
 
 static VALUE
-bf_to_file(self, filename)
-    VALUE self, filename;
+bf_to_file(VALUE self, VALUE filename)
 {
     GError* error = NULL;
     gboolean ret = g_bookmark_file_to_file(_SELF(self),
@@ -119,16 +114,14 @@ bf_to_file(self, filename)
 }
 
 static VALUE
-bf_has_item(self, uri)
-    VALUE self, uri;
+bf_has_item(VALUE self, VALUE uri)
 {
     return CBOOL2RVAL(g_bookmark_file_has_item(_SELF(self),
                                                (const gchar *)RVAL2CSTR(uri))); 
 }
 
 static VALUE
-bf_has_group(self, uri, group)
-    VALUE self, uri, group;
+bf_has_group(VALUE self, VALUE uri, VALUE group)
 {
     GError* error = NULL;
     return CBOOL2RVAL(g_bookmark_file_has_group(_SELF(self),
@@ -138,8 +131,7 @@ bf_has_group(self, uri, group)
 }
 	                                           
 static VALUE
-bf_has_application(self, uri, name)
-    VALUE self, uri, name;
+bf_has_application(VALUE self, VALUE uri, VALUE name)
 {
     GError* error = NULL;
     return CBOOL2RVAL(g_bookmark_file_has_application(_SELF(self),
@@ -149,15 +141,13 @@ bf_has_application(self, uri, name)
 }
 	                                           
 static VALUE
-bf_get_size(self)
-    VALUE self;
+bf_get_size(VALUE self)
 {
     return INT2NUM(g_bookmark_file_get_size(_SELF(self)));
 }
 
 static VALUE
-bf_get_uris(self)
-    VALUE self;
+bf_get_uris(VALUE self)
 {
     int i;
     gsize len;
@@ -174,8 +164,7 @@ bf_get_uris(self)
 }
 
 static VALUE
-bf_get_title(self, uri)
-    VALUE self, uri;
+bf_get_title(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gchar* ret = g_bookmark_file_get_title(_SELF(self),
@@ -186,8 +175,7 @@ bf_get_title(self, uri)
 }
 
 static VALUE
-bf_get_description(self, uri)
-    VALUE self, uri;
+bf_get_description(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gchar* ret = g_bookmark_file_get_description(_SELF(self),
@@ -198,8 +186,7 @@ bf_get_description(self, uri)
 }
 
 static VALUE
-bf_get_mime_type(self, uri)
-    VALUE self, uri;
+bf_get_mime_type(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gchar* ret = g_bookmark_file_get_mime_type(_SELF(self),
@@ -210,8 +197,7 @@ bf_get_mime_type(self, uri)
 }
 
 static VALUE
-bf_get_is_private(self, uri)
-    VALUE self, uri;
+bf_get_is_private(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gboolean ret = g_bookmark_file_get_is_private(_SELF(self),
@@ -222,8 +208,7 @@ bf_get_is_private(self, uri)
 }
 
 static VALUE
-bf_get_icon(self, uri)
-    VALUE self, uri;
+bf_get_icon(VALUE self, VALUE uri)
 {
     gchar* href;
     gchar* mime_type;
@@ -240,8 +225,7 @@ bf_get_icon(self, uri)
 }
 
 static VALUE
-bf_get_added(self, uri)
-    VALUE self, uri;
+bf_get_added(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     time_t ret = g_bookmark_file_get_added(_SELF(self),
@@ -253,8 +237,7 @@ bf_get_added(self, uri)
 }
 
 static VALUE
-bf_get_modified(self, uri)
-    VALUE self, uri;
+bf_get_modified(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     time_t ret = g_bookmark_file_get_modified(_SELF(self),
@@ -266,8 +249,7 @@ bf_get_modified(self, uri)
 }
 
 static VALUE
-bf_get_visited(self, uri)
-    VALUE self, uri;
+bf_get_visited(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     time_t ret = g_bookmark_file_get_visited(_SELF(self),
@@ -279,8 +261,7 @@ bf_get_visited(self, uri)
 }
 
 static VALUE
-bf_get_groups(self, uri)
-    VALUE self, uri;
+bf_get_groups(VALUE self, VALUE uri)
 {
     gsize length;
     VALUE ary;
@@ -302,8 +283,7 @@ bf_get_groups(self, uri)
 }
 
 static VALUE
-bf_get_applications(self, uri)
-    VALUE self, uri;
+bf_get_applications(VALUE self, VALUE uri)
 {
     gsize length;
     VALUE ary;
@@ -325,8 +305,7 @@ bf_get_applications(self, uri)
 }
   
 static VALUE
-bf_get_app_info(self, uri, name)
-    VALUE self, uri, name;
+bf_get_app_info(VALUE self, VALUE uri, VALUE name)
 {
     gchar* exec;
     guint count;
@@ -343,8 +322,7 @@ bf_get_app_info(self, uri, name)
 }
 
 static VALUE
-bf_set_title(self, uri, title)
-    VALUE self, uri, title;
+bf_set_title(VALUE self, VALUE uri, VALUE title)
 {
     g_bookmark_file_set_title(_SELF(self),
                               (const gchar *)RVAL2CSTR(uri),
@@ -353,8 +331,7 @@ bf_set_title(self, uri, title)
 }
 
 static VALUE
-bf_set_description(self, uri, description)
-    VALUE self, uri, description;
+bf_set_description(VALUE self, VALUE uri, VALUE description)
 {
     g_bookmark_file_set_description(_SELF(self),
                                     (const gchar *)RVAL2CSTR(uri),
@@ -363,8 +340,7 @@ bf_set_description(self, uri, description)
 }
 
 static VALUE
-bf_set_mime_type(self, uri, mime_type)
-    VALUE self, uri, mime_type;
+bf_set_mime_type(VALUE self, VALUE uri, VALUE mime_type)
 {
     g_bookmark_file_set_mime_type(_SELF(self),
                                   (const gchar *)RVAL2CSTR(uri),
@@ -373,8 +349,7 @@ bf_set_mime_type(self, uri, mime_type)
 }
 
 static VALUE
-bf_set_is_private(self, uri, is_private)
-    VALUE self, uri, is_private;
+bf_set_is_private(VALUE self, VALUE uri, VALUE is_private)
 {
     g_bookmark_file_set_is_private(_SELF(self),
                                    (const gchar *)RVAL2CSTR(uri),
@@ -383,8 +358,7 @@ bf_set_is_private(self, uri, is_private)
 }
 
 static VALUE
-bf_set_icon(self, uri, href, mime_type)
-    VALUE self, uri, href, mime_type;
+bf_set_icon(VALUE self, VALUE uri, VALUE href, VALUE mime_type)
 {
     g_bookmark_file_set_icon(_SELF(self),
                              (const gchar *)RVAL2CSTR(uri),
@@ -394,8 +368,7 @@ bf_set_icon(self, uri, href, mime_type)
 }
 
 static VALUE
-bf_set_added(self, uri, time)
-    VALUE self, uri, time;
+bf_set_added(VALUE self, VALUE uri, VALUE time)
 {
     g_bookmark_file_set_added(_SELF(self), 
                               (const gchar *)RVAL2CSTR(uri),
@@ -404,8 +377,7 @@ bf_set_added(self, uri, time)
 }
 
 static VALUE
-bf_set_groups(self, uri, groups)
-    VALUE self, uri, groups;
+bf_set_groups(VALUE self, VALUE uri, VALUE groups)
 {
     gint len = RARRAY_LEN(groups);
     gchar** glist = ALLOCA_N(gchar*, len);
@@ -422,8 +394,7 @@ bf_set_groups(self, uri, groups)
 }
 
 static VALUE
-bf_set_modified(self, uri, time)
-    VALUE self, uri, time;
+bf_set_modified(VALUE self, VALUE uri, VALUE time)
 {
     g_bookmark_file_set_modified(_SELF(self), 
                                  (const gchar *)RVAL2CSTR(uri),
@@ -432,8 +403,7 @@ bf_set_modified(self, uri, time)
 }
 
 static VALUE
-bf_set_visited(self, uri, time)
-    VALUE self, uri, time;
+bf_set_visited(VALUE self, VALUE uri, VALUE time)
 {
     g_bookmark_file_set_visited(_SELF(self), 
                                 (const gchar *)RVAL2CSTR(uri),
@@ -442,8 +412,7 @@ bf_set_visited(self, uri, time)
 }
 
 static VALUE
-bf_set_app_info(self, uri, name, exec, count, stamp)
-    VALUE self,uri, name, exec, count, stamp;
+bf_set_app_info(VALUE self, VALUE uri, VALUE name, VALUE exec, VALUE count, VALUE stamp)
 {
     GError* error = NULL;
     gboolean ret = g_bookmark_file_set_app_info(_SELF(self),
@@ -460,8 +429,7 @@ bf_set_app_info(self, uri, name, exec, count, stamp)
 }
 
 static VALUE 
-bf_add_group(self, uri, group)
-    VALUE self, uri, group;
+bf_add_group(VALUE self, VALUE uri, VALUE group)
 {
     g_bookmark_file_add_group(_SELF(self),
                               (const gchar *)RVAL2CSTR(uri),
@@ -470,8 +438,7 @@ bf_add_group(self, uri, group)
 }
 
 static VALUE
-bf_add_application(self, uri, name, exec)
-    VALUE self, uri, name, exec;
+bf_add_application(VALUE self, VALUE uri, VALUE name, VALUE exec)
 {
     g_bookmark_file_add_application(_SELF(self),
                                     (const gchar *)RVAL2CSTR(uri),
@@ -481,8 +448,7 @@ bf_add_application(self, uri, name, exec)
 }
 
 static VALUE
-bf_remove_group(self, uri, group)
-    VALUE self, uri, group;
+bf_remove_group(VALUE self, VALUE uri, VALUE group)
 {
     GError* error = NULL;
     gboolean ret = g_bookmark_file_remove_group(_SELF(self),
@@ -495,8 +461,7 @@ bf_remove_group(self, uri, group)
 }
 
 static VALUE
-bf_remove_application(self, uri, name)
-    VALUE self, uri, name;
+bf_remove_application(VALUE self, VALUE uri, VALUE name)
 {
     GError *error = NULL;
     gboolean ret = g_bookmark_file_remove_application(_SELF(self),
@@ -510,8 +475,7 @@ bf_remove_application(self, uri, name)
 
 
 static VALUE
-bf_remove_item(self, uri)
-    VALUE self, uri;
+bf_remove_item(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     gboolean ret = g_bookmark_file_remove_item(_SELF(self),
@@ -523,8 +487,7 @@ bf_remove_item(self, uri)
 }
 
 static VALUE
-bf_move_item(self, old_uri, new_uri)
-    VALUE self, old_uri, new_uri;
+bf_move_item(VALUE self, VALUE old_uri, VALUE new_uri)
 {
     GError *error = NULL;
     gboolean ret = g_bookmark_file_move_item(_SELF(self),