gio2 1.0.0-x86-mingw32 → 1.0.1-x86-mingw32

data/ChangeLog

@@ -1,7 +1,30 @@
+2011-09-16  Nikolai Weibull  <now@bitwi.se>
+
+	* lib/gio2.rb: Remove unused variable.
+	* ext/gio2/gthemedicon.c: Fix argument number for
+	GLib::ThemedIcon#initialize.
+
+2011-09-15  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/gio2/gsocket.c: Use G_REPLACE_GET_PROPERTY().
+
+2011-09-12  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/gio2/gio2.h: Fix RVAL2GSOCKETPROTOCOL and RVAL2GSOCKETTYPE
+	* ext/gio2/gsocket.c: Fix #local_address and #remote_address
+	property-overriding methods
+	* ext/gio2/gvolume.c: Name doubly-named #mount method
+	#mount/#get_mount.
+
+2011-09-09  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/gio2/gio2.h: Fix RVAL2GMOUNTMOUNTFLAGS.
+
 2011-01-30  Kouhei Sutou  <kou@cozmixng.org>
 
 	* Rakefile, ext/gio2/extconf.rb: share depended packages
 	vendor/local/.
+	* ext/gio2/*.c: Fix all RVAL2CSTR calls.
 
 2011-01-29  Kouhei Sutou  <kou@cozmixng.org>
 

data/ext/gio2/gfile.c

@@ -1080,7 +1080,7 @@ file_set_attribute(int argc, VALUE *argv, VALUE self)
         gint32 gint32_value;
         guint64 guint64_value;
         gint64 gint64_value;
-        char **stringv_value = NULL;
+        const char **stringv_value = NULL;
         GFileQueryInfoFlags flags;
         GCancellable *cancellable;
         GError *error = NULL;
@@ -1094,7 +1094,7 @@ file_set_attribute(int argc, VALUE *argv, VALUE self)
         switch (type) {
         case G_FILE_ATTRIBUTE_TYPE_STRING:
         case G_FILE_ATTRIBUTE_TYPE_BYTE_STRING:
-                value = RVAL2CSTR(rbvalue);
+                value = (gpointer)RVAL2CSTR(rbvalue);
                 break;
         case G_FILE_ATTRIBUTE_TYPE_BOOLEAN:
                 gboolean_value = RVAL2CBOOL(rbvalue);
@@ -1120,7 +1120,8 @@ file_set_attribute(int argc, VALUE *argv, VALUE self)
                 value = RVAL2GOBJ(rbvalue);
                 break;
         case G_FILE_ATTRIBUTE_TYPE_STRINGV:
-                value = stringv_value = ARY2STRVECTOR(rbvalue);
+                stringv_value = RVAL2STRV(rbvalue);
+                value = (gpointer)stringv_value;
                 break;
         case G_FILE_ATTRIBUTE_TYPE_INVALID:
         default:

data/ext/gio2/gio2.h

@@ -113,7 +113,7 @@ GType g_file_attribute_info_list_get_type(void);
 #define RVAL2GMOUNT(value) G_MOUNT(RVAL2GOBJ(value))
 
 #define RVAL2GMOUNTMOUNTFLAGS(value) \
-        RVAL2GFLAGS((value), G_TYPE_MOUNT_MOUNT_FLAGS)
+        RVAL2GENUM((value), G_TYPE_MOUNT_MOUNT_FLAGS)
 #define RVAL2GMOUNTMOUNTFLAGSDEFAULT(value) \
         RVAL2TYPE_WITH_DEFAULT((value), \
                                RVAL2GMOUNTMOUNTFLAGS, \
@@ -140,14 +140,14 @@ GType g_file_attribute_info_list_get_type(void);
 #define RVAL2GSOCKETFAMILY(value) RVAL2GENUM((value), G_TYPE_SOCKET_FAMILY)
 
 #define GSOCKETPROTOCOL2RVAL(value) GENUM2RVAL((value), G_TYPE_SOCKET_PROTOCOL)
-#define RVAL2GSOCKETPROTOCOL(value) RVAL2GFLAGS((value), G_TYPE_SOCKET_PROTOCOL)
+#define RVAL2GSOCKETPROTOCOL(value) RVAL2GENUM((value), G_TYPE_SOCKET_PROTOCOL)
 #define RVAL2GSOCKETPROTOCOLDEFAULT(value) \
         RVAL2TYPE_WITH_DEFAULT((value), \
                                RVAL2GSOCKETPROTOCOL, \
                                G_SOCKET_PROTOCOL_DEFAULT)
 
 #define GSOCKETTYPE2RVAL(value) GENUM2RVAL((value), G_TYPE_SOCKET_TYPE)
-#define RVAL2GSOCKETTYPE(value) RVAL2GFLAGS((value), G_TYPE_SOCKET_TYPE)
+#define RVAL2GSOCKETTYPE(value) RVAL2GENUM((value), G_TYPE_SOCKET_TYPE)
 
 #define GTIMEVAL2RVAL(value) rb_time_new((value)->tv_sec, (value)->tv_usec)
 
@@ -228,7 +228,6 @@ GType g_file_attribute_info_list_get_type(void);
 
 #define STRVECTOR2ARY(vector) rbgio_str_vector_to_ary(vector)
 #define STRVECTOR2ARY_FREE(vector) rbgio_str_vector_to_ary_free(vector)
-#define ARY2STRVECTOR(ary) rbgio_ary_to_str_vector(ary)
 
 G_GNUC_INTERNAL VALUE rbgio_cstr_to_rval_tainted(const char *string,
                                                  gsize length);
@@ -242,7 +241,6 @@ G_GNUC_INTERNAL GList *rbgio_gfile_ary_to_glist_accept_nil(VALUE ary);
 G_GNUC_INTERNAL void rbgio_rval_to_gtimeval(VALUE value, GTimeVal *time);
 G_GNUC_INTERNAL VALUE rbgio_str_vector_to_ary(const gchar * const *vector);
 G_GNUC_INTERNAL VALUE rbgio_str_vector_to_ary_free(gchar **vector);
-G_GNUC_INTERNAL char **rbgio_ary_to_str_vector(VALUE ary);
 G_GNUC_INTERNAL void rbgio_async_ready_callback(GObject *source,
                                        GAsyncResult *result,
                                        gpointer data);

data/ext/gio2/gsocket.c

@@ -298,7 +298,6 @@ socket_condition_wait(int argc, VALUE *argv, VALUE self)
         return self;
 }
 
-/* TODO: Need to make sure that this isn’t overridden. */
 static VALUE
 socket_get_local_address(VALUE self)
 {
@@ -367,7 +366,7 @@ Init_gsocket(VALUE glib)
         rb_define_method(socket, "create_source", socket_create_source, -1);
         rb_define_method(socket, "condition_check", socket_condition_check, 1);
         rb_define_method(socket, "condition_wait", socket_condition_wait, -1);
-        rb_define_method(socket, "local_address", socket_get_local_address, 0);
-        rb_define_method(socket, "remote_address", socket_get_remote_address, 0);
+        G_REPLACE_GET_PROPERTY(socket, "local_address", socket_get_local_address, 0);
+        G_REPLACE_GET_PROPERTY(socket, "remote_address", socket_get_remote_address, 0);
         rb_define_method(socket, "speaks_ipv4?", socket_speaks_ipv4, 0);
 }

data/ext/gio2/gthemedicon.c

@@ -26,14 +26,13 @@
 static VALUE
 themedicon_initialize(int argc, VALUE *argv, VALUE self)
 {
-        VALUE rbiconnames, with_default_fallbacks;
-        char **iconnames;
+        VALUE iconnames, with_default_fallbacks;
         GIcon *icon;
 
-        rb_scan_args(argc, argv, "11", &rbiconnames, &with_default_fallbacks);
+        rb_scan_args(argc, argv, "11", &iconnames, &with_default_fallbacks);
 
-        if (TYPE(rbiconnames) != T_ARRAY) {
-                const char *iconname = RVAL2CSTR(rbiconnames);
+        if (TYPE(iconnames) != T_ARRAY) {
+                const char *iconname = RVAL2CSTR(iconnames);
 
                 icon = RVAL2CBOOL(with_default_fallbacks) ?
                         g_themed_icon_new_with_default_fallbacks(iconname) :
@@ -48,11 +47,7 @@ themedicon_initialize(int argc, VALUE *argv, VALUE self)
                 rb_raise(rb_eArgError,
                          "only one argument allowed when first argument is an Array");
 
-        iconnames = ARY2STRVECTOR(rbiconnames);
-
-        icon = g_themed_icon_new_from_names(iconnames, -1);
-
-        g_free(iconnames);
+        icon = g_themed_icon_new_from_names(RVAL2STRV_DUP(iconnames), -1);
 
         G_INITIALIZE(self, icon);
 
@@ -80,7 +75,7 @@ Init_gthemedicon(VALUE glib)
 {
         VALUE themedicon = G_DEF_INTERFACE(G_TYPE_THEMED_ICON, "ThemedIcon", glib);
 
-        rb_define_method(themedicon, "initialize", themedicon_initialize, 1);
+        rb_define_method(themedicon, "initialize", themedicon_initialize, -1);
         rb_define_method(themedicon, "prepend_name", themedicon_prepend_name, 1);
         rb_define_method(themedicon, "append_name", themedicon_append_name, 1);
 }

data/ext/gio2/gvolume.c

@@ -176,7 +176,7 @@ Init_gvolume(VALUE glib)
         rb_define_method(volume, "uuid", volume_get_uuid, 0);
         rb_define_method(volume, "icon", volume_get_icon, 0);
         rb_define_method(volume, "drive", volume_get_drive, 0);
-        rb_define_method(volume, "mount", volume_get_mount, 0);
+        rb_define_method(volume, "get_mount", volume_get_mount, 0);
         rb_define_method(volume, "can_mount?", volume_can_mount, 0);
         rb_define_method(volume, "should_automount?", volume_should_automount, 0);
         rb_define_method(volume, "activation_root", volume_get_activation_root, 0);

data/ext/gio2/util.c

@@ -198,26 +198,6 @@ rbgio_str_vector_to_ary_free(gchar **vector)
                          rbgio_str_vector_to_ary_free_ensure, (VALUE)vector);
 }
 
-char **
-rbgio_ary_to_str_vector(VALUE ary)
-{
-        int i, n;
-        char **strings;
-
-        ary = rb_ary_to_ary(ary);
-        n = RARRAY_LEN(ary);
-
-        for (i = 0; i < n; i++)
-                StringValue(RARRAY_PTR(ary)[i]);
-
-        strings = g_new(char *, n + 1);
-        for (i = 0; i < n; i++)
-                strings[i] = RVAL2CSTR(RARRAY_PTR(ary)[i]);
-        strings[n] = NULL;
-
-        return strings;
-}
-
 struct async_ready_callback_data
 {
         GAsyncResult *result;

data/lib/gio2.rb

@@ -5,7 +5,7 @@ vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_environment_path(vendor_bin_dir)
 begin
-  major, minor, micro, = RUBY_VERSION.split(/\./)
+  major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/gio2.so"
 rescue LoadError
   require "gio2.so"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gio2
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: x86-mingw32
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 Z
+date: 2011-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: glib2
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 description: Ruby/GIO2 is a Ruby binding of gio-2.x.