glib2 1.0.0-x86-mingw32 → 1.0.1-x86-mingw32

data/ext/glib2/rbglib_completion.c

@@ -46,7 +46,7 @@ g_completion_get_type(void)
 #define _SELF(s) ((GCompletion*)RVAL2BOXED(s, G_TYPE_COMPLETION))
 
 /* data should be [self, data] */
-static gchar*
+static gchar *
 comp_func(gpointer compdata)
 {
     VALUE ret;
@@ -60,7 +60,7 @@ comp_func(gpointer compdata)
     } else {
         ret = rb_funcall(func, id_call, 1, data);
     }
-    return RVAL2CSTR(ret);
+    return (gchar *)RVAL2CSTR(ret);
 }
 
 static VALUE
@@ -88,7 +88,7 @@ comp_add_items(VALUE self, VALUE items)
     GList* list = (GList*)NULL;
     VALUE items_internal = rb_ivar_get(self, id_items_internal);
 
-    Check_Type(items, T_ARRAY);
+    items = rb_ary_to_ary(items);
     len = RARRAY_LEN(items);
     for (i = 0; i < len; i ++){
         VALUE data = RARRAY_PTR(items)[i];
@@ -108,7 +108,7 @@ comp_remove_items(VALUE self, VALUE items)
     GList* list = (GList*)NULL;
     VALUE items_internal = rb_ivar_get(self, id_items_internal);
 
-    Check_Type(items, T_ARRAY);
+    items = rb_ary_to_ary(items);
     len = RARRAY_LEN(items);
     for (i = 0; i < len; i ++){
         VALUE data = RARRAY_PTR(items)[i];

data/ext/glib2/rbglib_error.c

@@ -52,7 +52,7 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
 
     if (! NIL_P(gtype)){
         GEnumClass* gclass = g_type_class_ref(gtype);
-        int i;
+        guint i;
 
         for (i = 0; i < gclass->n_values; i++) {
             GEnumValue* entry = &(gclass->values[i]);

data/ext/glib2/rbglib_i18n.c

@@ -19,16 +19,7 @@
 static VALUE
 rbglib_m_language_names(VALUE self)
 {
-    const gchar * const *languages;
-    const gchar *language;
-    VALUE rb_languages = rb_ary_new();
-
-    languages = g_get_language_names();
-    for (language = *languages; *languages; language = *(++languages)) {
-        rb_ary_push(rb_languages, CSTR2RVAL(language));
-    }
-
-    return rb_languages;
+    return STRV2RVAL((const gchar **)g_get_language_names());
 }
 #endif
 

data/ext/glib2/rbglib_iochannel.c

@@ -89,6 +89,8 @@ ioc_s_open(gint argc, VALUE *argv, VALUE self)
     if (TYPE(arg1) == T_FIXNUM){
 #ifdef G_OS_UNIX
         io = g_io_channel_unix_new(NUM2INT(arg1));
+#elif defined(G_OS_WIN32)
+        io = g_io_channel_win32_new_fd(NUM2INT(arg1));
 #else
         rb_raise(rb_eRuntimeError,
                  "GLib::IOChannel.new(fd) is supported on "
@@ -651,10 +653,12 @@ static VALUE
 ioc_win32_socket_initialize(VALUE self, VALUE socket)
 {
     GIOChannel *io = NULL;
+    int fd;
 
     rb_secure(4);
     /* TODO: support IO object */
-    io = g_io_channel_win32_new_socket(NUM2INT(socket));
+    fd = NUM2INT(socket);
+    io = g_io_channel_win32_new_socket(rb_w32_get_osfhandle(fd));
     G_INITIALIZE(self, io);
 
     return Qnil;

data/ext/glib2/rbglib_keyfile.c

@@ -70,7 +70,7 @@ keyfile_load_from_file(int argc, VALUE *argv, VALUE self)
     }
 
     ret = g_key_file_load_from_file(_SELF(self), 
-                                    (const gchar*)RVAL2CSTR(file),
+                                    RVAL2CSTR(file),
                                     gflags, &error);
 
     if (! ret) RAISE_GERROR(error);
@@ -137,39 +137,28 @@ keyfile_load_from_dirs(int argc, VALUE *argv, VALUE self)
     GError* error = NULL;
     gboolean success;
     const gchar *file;
-    gchar **search_dirs;
+    const gchar **search_dirs;
     gchar* full_path;
     GKeyFileFlags flags;
 
     rb_scan_args(argc, argv, "12", &rb_file, &rb_search_dirs, &rb_flags);
 
     file = RVAL2CSTR(rb_file);
-    if (NIL_P(rb_search_dirs)) {
-	search_dirs = NULL;
-    }
-    else {
-	long i, len;
-
-	Check_Type(rb_search_dirs, T_ARRAY);
-	len = RARRAY_LEN(rb_search_dirs);
-	search_dirs = ALLOCA_N(gchar *, len + 1);
-	for (i = 0; i < len; i++) {
-	    search_dirs[i] = RVAL2CSTR(RARRAY_PTR(rb_search_dirs)[i]);
-	}
-	search_dirs[i] = NULL;
-    }
+    search_dirs = RVAL2STRV_ACCEPT_NIL(rb_search_dirs);
     flags = G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS;
     if (!NIL_P(rb_flags))
         flags = RVAL2GFLAGS(rb_flags, G_TYPE_KEY_FILE_FLAGS);
 
-    if (search_dirs)
+    if (search_dirs != NULL)
 	success = g_key_file_load_from_dirs(_SELF(self), file,
-					    (const gchar **)search_dirs,
+					    search_dirs,
 					    &full_path, flags, &error);
     else
 	success = g_key_file_load_from_data_dirs(_SELF(self), file,
 						 &full_path, flags, &error);
 
+    g_free(search_dirs);
+
     if (!success)
 	RAISE_GERROR(error);
 
@@ -197,40 +186,21 @@ keyfile_get_start_group(VALUE self)
 static VALUE
 keyfile_get_groups(VALUE self)
 {
-    gsize length;
-    int i;
-    gchar** groups = g_key_file_get_groups(_SELF(self), &length);
-    VALUE ary = rb_ary_new();
-
-    for (i = 0; i < length; i++){
-        rb_ary_push(ary, CSTR2RVAL(groups[i]));
-    }
-
-    g_strfreev(groups);
-
-    return ary;
+    return STRV2RVAL_FREE(g_key_file_get_groups(_SELF(self), NULL));
 }
 
 static VALUE
 keyfile_get_keys(VALUE self, VALUE group_name)
 {
-    gsize length;
-    int i;
-    GError* error = NULL;
-    gchar** keys = g_key_file_get_keys(_SELF(self), 
-                                       (const gchar*)RVAL2CSTR(group_name),
-                                       &length, &error);
-    VALUE ary = rb_ary_new();
-
-    if (error) RAISE_GERROR(error);
-
-    for (i = 0; i < length; i++){
-        rb_ary_push(ary, CSTR2RVAL(keys[i]));
-    }
-
-    g_strfreev(keys);
+    GError *error = NULL;
+    gchar **keys = g_key_file_get_keys(_SELF(self),
+                                       RVAL2CSTR(group_name),
+                                       NULL,
+                                       &error);
+    if (error != NULL)
+        RAISE_GERROR(error);
 
-    return ary;
+    return STRV2RVAL_FREE(keys);
 }
 
 static VALUE
@@ -350,7 +320,7 @@ static VALUE
 keyfile_get_string_list(VALUE self, VALUE group_name, VALUE key)
 {
     VALUE ary;
-    gint i;
+    gsize i;
     gsize length;
     GError* error = NULL;
     gchar** ret = g_key_file_get_string_list(_SELF(self), 
@@ -375,7 +345,7 @@ keyfile_get_locale_string_list(int argc, VALUE *argv, VALUE self)
     VALUE group_name, key, locale;
     GError* error = NULL;
     VALUE ary;
-    gint i;
+    gsize i;
     gsize length;
     gchar** ret;
 
@@ -402,7 +372,7 @@ static VALUE
 keyfile_get_boolean_list(VALUE self, VALUE group_name, VALUE key)
 {
     VALUE ary;
-    gint i;
+    gsize i;
     gsize length;
     GError* error = NULL;
     gboolean* ret = g_key_file_get_boolean_list(_SELF(self), 
@@ -423,7 +393,7 @@ static VALUE
 keyfile_get_integer_list(VALUE self, VALUE group_name, VALUE key)
 {
     VALUE ary;
-    gint i;
+    gsize i;
     gsize length;
     GError* error = NULL;
     gint* ret = g_key_file_get_integer_list(_SELF(self), 
@@ -445,7 +415,7 @@ static VALUE
 keyfile_get_double_list(VALUE self, VALUE group_name, VALUE key)
 {
     VALUE ary;
-    gint i;
+    gsize i;
     gsize length;
     GError* error = NULL;
     gdouble* ret = g_key_file_get_double_list(_SELF(self), 
@@ -535,38 +505,36 @@ keyfile_set_double(VALUE self, VALUE group_name, VALUE key, VALUE value)
 #endif
 
 static VALUE
-keyfile_set_string_list(VALUE self, VALUE group_name, VALUE key, VALUE list)
+keyfile_set_string_list(VALUE self, VALUE group_name, VALUE key, VALUE rblist)
 {
-    gint len = RARRAY_LEN(list);
-    gchar** glist = ALLOCA_N(gchar*, len);
-    gint i;
-
-    for (i = 0; i < len; i++){
-        glist[i] = RVAL2CSTR(RARRAY_PTR(list)[i]);
-    }
+    VALUE ary = rb_ary_to_ary(rblist);
+    const gchar **list = RVAL2STRV(ary);
 
     g_key_file_set_string_list(_SELF(self), 
-                               (const gchar*)RVAL2CSTR(group_name),
-                               (const gchar*)RVAL2CSTR(key),
-                               (const gchar**)glist, len);
+                               RVAL2CSTR(group_name),
+                               RVAL2CSTR(key),
+                               list,
+                               RARRAY_LEN(ary));
+
+    g_free(list);
+
     return self;
 }
 
 static VALUE
-keyfile_set_locale_string_list(VALUE self, VALUE group_name, VALUE key, VALUE locale, VALUE list)
+keyfile_set_locale_string_list(VALUE self, VALUE group_name, VALUE key, VALUE locale, VALUE rblist)
 {
-    gint len = RARRAY_LEN(list);
-    gchar** glist = ALLOCA_N(gchar*, len);
-    gint i;
+    VALUE ary = rb_ary_to_ary(rblist);
+    const gchar **list = RVAL2STRV(ary);
 
-    for (i = 0; i < len; i++){
-        glist[i] = RVAL2CSTR(RARRAY_PTR(list)[i]);
-    }
+    g_key_file_set_locale_string_list(_SELF(self),
+                                      RVAL2CSTR(group_name),
+                                      RVAL2CSTR(key),
+                                      RVAL2CSTR(locale),
+                                      list,
+                                      RARRAY_LEN(ary));
 
-    g_key_file_set_locale_string_list(_SELF(self), (const gchar*)RVAL2CSTR(group_name),
-                                      (const gchar*)RVAL2CSTR(key),
-                                      (const gchar*)RVAL2CSTR(locale),
-                                      (const gchar**)glist, len);
+    g_free(list);
 
     return self;
 }
@@ -574,36 +542,44 @@ keyfile_set_locale_string_list(VALUE self, VALUE group_name, VALUE key, VALUE lo
 static VALUE
 keyfile_set_boolean_list(VALUE self, VALUE group_name, VALUE key, VALUE list)
 {
-    gint len = RARRAY_LEN(list);
-    gboolean* glist = ALLOCA_N(gboolean, len);
-    gint i;
+    VALUE ary;
+    long i, n;
+    gboolean *booleans;
 
-    for (i = 0; i < len; i++){
-        glist[i] = RVAL2CBOOL(RARRAY_PTR(list)[i]);
-    }
+    ary = rb_ary_to_ary(list);
+    n = RARRAY_LEN(ary);
+    booleans = ALLOCA_N(gboolean, n);
+    for (i = 0; i < n; i++)
+        booleans[i] = RVAL2CBOOL(RARRAY_PTR(ary)[i]);
 
     g_key_file_set_boolean_list(_SELF(self),
-                                (const gchar*)RVAL2CSTR(group_name),
-                                (const gchar*)RVAL2CSTR(key),
-                                glist, len);
+                                RVAL2CSTR(group_name),
+                                RVAL2CSTR(key),
+                                booleans,
+                                n);
+
     return self;
 }
 
 static VALUE
 keyfile_set_integer_list(VALUE self, VALUE group_name, VALUE key, VALUE list)
 {
-    gint len = RARRAY_LEN(list);
-    gint* glist = ALLOCA_N(gint, len);
-    gint i;
+    VALUE ary;
+    long i, n;
+    gint *ints;
 
-    for (i = 0; i < len; i++){
-        glist[i] = RVAL2CBOOL(RARRAY_PTR(list)[i]);
-    }
+    ary = rb_ary_to_ary(list);
+    n = RARRAY_LEN(ary);
+    ints = ALLOCA_N(gint, n);
+    for (i = 0; i < n; i++)
+        ints[i] = NUM2INT(RARRAY_PTR(ary)[i]);
 
     g_key_file_set_integer_list(_SELF(self),
-                                (const gchar*)RVAL2CSTR(group_name),
-                                (const gchar*)RVAL2CSTR(key),
-                                glist, len);
+                                RVAL2CSTR(group_name),
+                                RVAL2CSTR(key),
+                                ints,
+                                n);
+
     return self;
 }
 
@@ -611,18 +587,22 @@ keyfile_set_integer_list(VALUE self, VALUE group_name, VALUE key, VALUE list)
 static VALUE
 keyfile_set_double_list(VALUE self, VALUE group_name, VALUE key, VALUE list)
 {
-    gint len = RARRAY_LEN(list);
-    gdouble* glist = ALLOCA_N(gdouble, len);
-    gint i;
-
-    for (i = 0; i < len; i++){
-        glist[i] = RVAL2CBOOL(RARRAY_PTR(list)[i]);
-    }
+    VALUE ary;
+    long i, n;
+    gdouble *doubles;
+    
+    ary = rb_ary_to_ary(list);
+    n = RARRAY_LEN(ary);
+    doubles = ALLOCA_N(gdouble, n);
+    for (i = 0; i < n; i++)
+        doubles[i] = NUM2DBL(RARRAY_PTR(ary)[i]);
 
     g_key_file_set_double_list(_SELF(self),
-                                (const gchar*)RVAL2CSTR(group_name),
-                                (const gchar*)RVAL2CSTR(key),
-                               glist, len);
+                               RVAL2CSTR(group_name),
+                               RVAL2CSTR(key),
+                               doubles,
+                               n);
+
     return self;
 }
 #endif
@@ -631,11 +611,14 @@ static VALUE
 keyfile_set_comment(VALUE self, VALUE group_name, VALUE key, VALUE comment)
 {
     GError* error = NULL;
-    g_key_file_set_comment(_SELF(self), (const gchar*)RVAL2CSTR(group_name),
-                           (const gchar*)(NIL_P(key) ? NULL : RVAL2CSTR(key)),
-                           (const gchar*)RVAL2CSTR(comment), &error);
 
-    if (error) RAISE_GERROR(error);
+    g_key_file_set_comment(_SELF(self),
+                           RVAL2CSTR(group_name),
+                           RVAL2CSTR_ACCEPT_NIL(key),
+                           RVAL2CSTR(comment),
+                           &error);
+    if (error != NULL)
+        RAISE_GERROR(error);
 
     return self;
 }
@@ -644,9 +627,11 @@ static VALUE
 keyfile_remove_group(VALUE self, VALUE group_name)
 {
     GError* error = NULL;
-    g_key_file_remove_group(_SELF(self), (const gchar*)RVAL2CSTR(group_name), &error);
 
-    if (error) RAISE_GERROR(error);
+    g_key_file_remove_group(_SELF(self), RVAL2CSTR(group_name), &error);
+
+    if (error != NULL)
+        RAISE_GERROR(error);
 
     return self;
 }
@@ -655,12 +640,14 @@ static VALUE
 keyfile_remove_key(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
+
     g_key_file_remove_key(_SELF(self), 
-                          (const gchar*)RVAL2CSTR(group_name), 
-                          (const gchar*)RVAL2CSTR(key), 
+                          RVAL2CSTR(group_name), 
+                          RVAL2CSTR(key), 
                           &error);
 
-    if (error) RAISE_GERROR(error);
+    if (error != NULL)
+        RAISE_GERROR(error);
 
     return self;
 }
@@ -670,12 +657,14 @@ static VALUE
 keyfile_remove_comment(VALUE self, VALUE group_name, VALUE key)
 {
     GError* error = NULL;
+
     g_key_file_remove_comment(_SELF(self), 
-                          (const gchar*)RVAL2CSTR(group_name), 
-                          (const gchar*)RVAL2CSTR(key), 
-                          &error);
+                              RVAL2CSTR(group_name), 
+                              RVAL2CSTR(key), 
+                              &error);
 
-    if (error) RAISE_GERROR(error);
+    if (error != NULL)
+        RAISE_GERROR(error);
 
     return self;
 }