gio2 0.90.5-x86-mingw32 → 0.90.6-x86-mingw32

data/ext/gio2/giomodule.c

@@ -57,7 +57,7 @@ Init_giomodule(VALUE glib)
 
         iomodules = rb_define_module_under(glib, "IOModules");
 
-        rb_define_module_function(iomodule, "load_all_in_directory", iomodule_load_all_in_directory, 1);
-        rb_define_module_function(iomodule, "scan_all_in_directory", iomodule_scan_all_in_directory, 1);
+        rb_define_module_function(iomodules, "load_all_in_directory", iomodule_load_all_in_directory, 1);
+        rb_define_module_function(iomodules, "scan_all_in_directory", iomodule_scan_all_in_directory, 1);
 
 }

data/ext/gio2/gioscheduler.c

@@ -103,7 +103,7 @@ ioscheduler_push_job(int argc, VALUE *argv, VALUE self)
         gint io_priority;
         GCancellable *cancellable;
 
-        rb_scan_args(argc, argv, "01", &rbio_priority, &rbcancellable);
+        rb_scan_args(argc, argv, "02", &rbio_priority, &rbcancellable);
         io_priority = RVAL2IOPRIORITYDEFAULT(rbio_priority);
         cancellable = RVAL2GCANCELLABLE(rbcancellable);
         block = rb_block_proc();
@@ -184,11 +184,9 @@ Init_gioscheduler(VALUE glib)
 {
         VALUE ioschedulerjob = G_DEF_CLASS(G_TYPE_IO_SCHEDULER_JOB, "IOSchedulerJob", glib);
 
-        /* TODO: These don’t follow naming scheme exactly, but seems redundant
-         * to add GLib::IOScheduler.  Perhaps rename them to push and
-         * cancel_all. */
-        rb_define_singleton_method(ioschedulerjob, "push_job", ioscheduler_push_job, -1);
-        rb_define_singleton_method(ioschedulerjob, "cancel_all_jobs", ioscheduler_cancel_all_jobs, 0);
+        VALUE ioscheduler = rb_define_module_under(glib, "IOScheduler");
+        rb_define_singleton_method(ioscheduler, "push_job", ioscheduler_push_job, -1);
+        rb_define_singleton_method(ioscheduler, "cancel_all_jobs", ioscheduler_cancel_all_jobs, 0);
 
         rb_define_method(ioschedulerjob, "send_to_mainloop", ioschedulerjob_send_to_mainloop, 0);
         rb_define_method(ioschedulerjob, "send_to_mainloop_async", ioschedulerjob_send_to_mainloop_async, 0);

data/ext/gio2/giostream.c

@@ -22,18 +22,6 @@
 
 #define _SELF(value) G_IO_STREAM(RVAL2GOBJ(value))
 
-static VALUE
-iostream_get_input_stream(VALUE self)
-{
-        return GOBJ2RVAL(g_io_stream_get_input_stream(_SELF(self)));
-}
-
-static VALUE
-iostream_get_output_stream(VALUE self)
-{
-        return GOBJ2RVAL(g_io_stream_get_output_stream(_SELF(self)));
-}
-
 static VALUE
 iostream_close(VALUE self, VALUE cancellable)
 {
@@ -78,12 +66,6 @@ iostream_close_finish(VALUE self, VALUE result)
         return self;
 }
 
-static VALUE
-iostream_is_closed(VALUE self)
-{
-        return CBOOL2RVAL(g_io_stream_is_closed(_SELF(self)));
-}
-
 static VALUE
 iostream_has_pending(VALUE self)
 {
@@ -114,14 +96,9 @@ Init_giostream(VALUE glib)
 {
         VALUE iostream = G_DEF_CLASS(G_TYPE_IO_STREAM, "IOStream", glib);
 
-        rb_undef_alloc_func(iostream);
-
-        rb_define_method(iostream, "input_stream", iostream_get_input_stream, 0);
-        rb_define_method(iostream, "output_stream", iostream_get_output_stream, 0);
         rb_define_method(iostream, "close", iostream_close, 1);
         rb_define_method(iostream, "close_async", iostream_close_async, -1);
         rb_define_method(iostream, "close_finish", iostream_close_finish, 1);
-        rb_define_method(iostream, "closed?", iostream_is_closed, 0);
         rb_define_method(iostream, "has_pending?", iostream_has_pending, 0);
         rb_define_method(iostream, "set_pending", iostream_set_pending, 0);
         G_DEF_SETTER(iostream, "pending");

data/ext/gio2/gloadableicon.c

@@ -39,7 +39,6 @@ loadableicon_load(int argc, VALUE *argv, VALUE self)
         if (error != NULL)
                 rbgio_raise_error(error);
 
-        /* TODO: Should type be freed? */
         return rb_assoc_new(GOBJ2RVAL_UNREF(stream), CSTR2RVAL_FREE(type));
 }
 

data/ext/gio2/gmemoryoutputstream.c

@@ -20,8 +20,6 @@
 
 #include "gio2.h"
 
-#define _SELF(value) G_MEMORY_OUTPUT_STREAM(RVAL2GOBJ(value))
-
 /* TODO: Take string argument? */
 static VALUE
 memoryoutputstream_initialize(VALUE self)
@@ -34,32 +32,10 @@ memoryoutputstream_initialize(VALUE self)
         return Qnil;
 }
 
-/* TODO: Is there a way to avoid duplicating the result? */
-static VALUE
-memoryoutputstream_get_data(VALUE self)
-{
-        return CSTR2RVAL(g_memory_output_stream_get_data(_SELF(self)));
-}
-
-static VALUE
-memoryoutputstream_get_size(VALUE self)
-{
-        return GSIZE2RVAL(g_memory_output_stream_get_size(_SELF(self)));
-}
-
-static VALUE
-memoryoutputstream_get_data_size(VALUE self)
-{
-        return GSIZE2RVAL(g_memory_output_stream_get_data_size(_SELF(self)));
-}
-
 void
 Init_gmemoryoutputstream(VALUE glib)
 {
         VALUE memoryoutputstream = G_DEF_CLASS(G_TYPE_MEMORY_OUTPUT_STREAM, "MemoryOutputStream", glib);
 
         rb_define_method(memoryoutputstream, "initialize", memoryoutputstream_initialize, 0);
-        rb_define_method(memoryoutputstream, "data", memoryoutputstream_get_data, 0);
-        rb_define_method(memoryoutputstream, "size", memoryoutputstream_get_size, 0);
-        rb_define_method(memoryoutputstream, "data_size", memoryoutputstream_get_data_size, 0);
 }

data/ext/gio2/gmount.c

@@ -256,6 +256,7 @@ Init_gmount(VALUE glib)
 
         G_DEF_CLASS(G_TYPE_MOUNT_MOUNT_FLAGS, "MountFlags", mount);
         G_DEF_CONSTANTS(mount, G_TYPE_MOUNT_MOUNT_FLAGS, "G_MOUNT_");
+
         G_DEF_CLASS(G_TYPE_MOUNT_UNMOUNT_FLAGS, "UnmountFlags", mount);
         G_DEF_CONSTANTS(mount, G_TYPE_MOUNT_UNMOUNT_FLAGS, "G_MOUNT_");
 

data/ext/gio2/gmountoperation.c

@@ -39,90 +39,6 @@ mountoperation_initialize(VALUE self)
         return Qnil;
 }
 
-static VALUE
-mountoperation_get_username(VALUE self)
-{
-        return CSTR2RVAL(g_mount_operation_get_username(_SELF(self)));
-}
-
-static VALUE
-mountoperation_set_username(VALUE self, VALUE value)
-{
-        g_mount_operation_set_username(_SELF(self), RVAL2CSTR(value));
-
-        return self;
-}
-
-static VALUE
-mountoperation_get_password(VALUE self)
-{
-        return CSTR2RVAL(g_mount_operation_get_password(_SELF(self)));
-}
-
-static VALUE
-mountoperation_set_password(VALUE self, VALUE value)
-{
-        g_mount_operation_set_password(_SELF(self), RVAL2CSTR(value));
-
-        return self;
-}
-
-static VALUE
-mountoperation_get_anonymous(VALUE self)
-{
-        return CBOOL2RVAL(g_mount_operation_get_anonymous(_SELF(self)));
-}
-
-static VALUE
-mountoperation_set_anonymous(VALUE self, VALUE value)
-{
-        g_mount_operation_set_anonymous(_SELF(self), RVAL2CBOOL(value));
-
-        return self;
-}
-
-static VALUE
-mountoperation_get_domain(VALUE self)
-{
-        return CSTR2RVAL(g_mount_operation_get_domain(_SELF(self)));
-}
-
-static VALUE
-mountoperation_set_domain(VALUE self, VALUE value)
-{
-        g_mount_operation_set_domain(_SELF(self), RVAL2CSTR(value));
-
-        return self;
-}
-
-static VALUE
-mountoperation_get_password_save(VALUE self)
-{
-        return GPASSWORDSAVE2RVAL(g_mount_operation_get_password_save(_SELF(self)));
-}
-
-static VALUE
-mountoperation_set_password_save(VALUE self, VALUE value)
-{
-        g_mount_operation_set_password_save(_SELF(self), RVAL2GPASSWORDSAVE(value));
-
-        return self;
-}
-
-static VALUE
-mountoperation_get_choice(VALUE self)
-{
-        return INT2NUM(g_mount_operation_get_choice(_SELF(self)));
-}
-
-static VALUE
-mountoperation_set_choice(VALUE self, VALUE value)
-{
-        g_mount_operation_set_choice(_SELF(self), NUM2INT(value));
-
-        return self;
-}
-
 static VALUE
 mountoperation_reply(VALUE self, VALUE value)
 {
@@ -136,33 +52,15 @@ Init_gmountoperation(VALUE glib)
 {
         VALUE mountoperation = G_DEF_CLASS(G_TYPE_MOUNT_OPERATION, "MountOperation", glib);
 
-        /* TODO: Are these necessary? */
         G_DEF_CLASS(G_TYPE_MOUNT_OPERATION_RESULT, "Result", mountoperation);
         G_DEF_CONSTANTS(mountoperation, G_TYPE_MOUNT_OPERATION_RESULT, "G_MOUNT_OPERATION_");
 
         G_DEF_CLASS(G_TYPE_ASK_PASSWORD_FLAGS, "AskPasswordFlags", glib);
         G_DEF_CONSTANTS(glib, G_TYPE_ASK_PASSWORD_FLAGS, "G_");
+
         G_DEF_CLASS(G_TYPE_PASSWORD_SAVE, "PasswordSave", glib);
         G_DEF_CONSTANTS(glib, G_TYPE_PASSWORD_SAVE, "G_");
 
         rb_define_method(mountoperation, "initialize", mountoperation_initialize, 0);
-        rb_define_method(mountoperation, "username", mountoperation_get_username, 0);
-        rb_define_method(mountoperation, "set_username", mountoperation_set_username, 1);
-        G_DEF_SETTER(mountoperation, "username");
-        rb_define_method(mountoperation, "password", mountoperation_get_password, 0);
-        rb_define_method(mountoperation, "set_password", mountoperation_set_password, 1);
-        G_DEF_SETTER(mountoperation, "password");
-        rb_define_method(mountoperation, "anonymous", mountoperation_get_anonymous, 0);
-        rb_define_method(mountoperation, "set_anonymous", mountoperation_set_anonymous, 1);
-        G_DEF_SETTER(mountoperation, "anonymous");
-        rb_define_method(mountoperation, "domain", mountoperation_get_domain, 0);
-        rb_define_method(mountoperation, "set_domain", mountoperation_set_domain, 1);
-        G_DEF_SETTER(mountoperation, "domain");
-        rb_define_method(mountoperation, "password_save", mountoperation_get_password_save, 0);
-        rb_define_method(mountoperation, "set_password_save", mountoperation_set_password_save, 1);
-        G_DEF_SETTER(mountoperation, "password_save");
-        rb_define_method(mountoperation, "choice", mountoperation_get_choice, 0);
-        rb_define_method(mountoperation, "set_choice", mountoperation_set_choice, 1);
-        G_DEF_SETTER(mountoperation, "choice");
         rb_define_method(mountoperation, "reply", mountoperation_reply, 1);
 }

data/ext/gio2/gnetworkaddress.c

@@ -31,18 +31,6 @@ networkaddress_initialize(VALUE self, VALUE hostname, VALUE port)
         return Qnil;
 }
 
-static VALUE
-networkaddress_get_hostname(VALUE self)
-{
-        return CSTR2RVAL(g_network_address_get_hostname(_SELF(self)));
-}
-
-static VALUE
-networkaddress_get_port(VALUE self)
-{
-        return GUINT162RVAL(g_network_address_get_port(_SELF(self)));
-}
-
 static VALUE
 networkaddress_parse(G_GNUC_UNUSED VALUE self, VALUE host_and_port, VALUE default_port)
 {
@@ -66,6 +54,4 @@ Init_gnetworkaddress(VALUE glib)
         rb_define_singleton_method(networkaddress, "parse", networkaddress_parse, 2);
 
         rb_define_method(networkaddress, "initialize", networkaddress_initialize, 2);
-        rb_define_method(networkaddress, "hostname", networkaddress_get_hostname, 0);
-        rb_define_method(networkaddress, "port", networkaddress_get_port, 0);
 }

data/ext/gio2/gnetworkservice.c

@@ -34,31 +34,10 @@ networkservice_initialize(VALUE self, VALUE service, VALUE protocol, VALUE domai
         return Qnil;
 }
 
-static VALUE
-networkservice_get_service(VALUE self)
-{
-        return CSTR2RVAL(g_network_service_get_service(_SELF(self)));
-}
-
-static VALUE
-networkservice_get_protocol(VALUE self)
-{
-        return CSTR2RVAL(g_network_service_get_protocol(_SELF(self)));
-}
-
-static VALUE
-networkservice_get_domain(VALUE self)
-{
-        return CSTR2RVAL(g_network_service_get_domain(_SELF(self)));
-}
-
 void
 Init_gnetworkservice(VALUE glib)
 {
         VALUE networkservice = G_DEF_CLASS(G_TYPE_NETWORK_SERVICE, "NetworkService", glib);
 
         rb_define_method(networkservice, "initialize", networkservice_initialize, 3);
-        rb_define_method(networkservice, "service", networkservice_get_service, 0);
-        rb_define_method(networkservice, "protocol", networkservice_get_protocol, 0);
-        rb_define_method(networkservice, "domain", networkservice_get_domain, 0);
 }

data/ext/gio2/goutputstream.c

@@ -33,21 +33,17 @@
 static VALUE
 outputstream_write(int argc, VALUE *argv, VALUE self)
 {
-        VALUE rbbuffer, rbcancellable;
+        VALUE rbbuffer, cancellable;
         const char *buffer;
-        gsize count;
-        GCancellable *cancellable;
         GError *error = NULL;
         gssize bytes_written;
 
-        rb_scan_args(argc, argv, "11", &rbbuffer, &rbcancellable);
+        rb_scan_args(argc, argv, "11", &rbbuffer, &cancellable);
         buffer = RVAL2CSTR(rbbuffer);
-        count = RSTRING_LEN(rbbuffer);
-        cancellable = RVAL2GCANCELLABLE(rbcancellable);
         bytes_written = g_output_stream_write(_SELF(self),
                                               buffer,
-                                              count,
-                                              cancellable,
+                                              (gsize)RSTRING_LEN(rbbuffer),
+                                              RVAL2GCANCELLABLE(cancellable),
                                               &error);
         if (bytes_written == -1)
                 rbgio_raise_error(error);
@@ -58,22 +54,18 @@ outputstream_write(int argc, VALUE *argv, VALUE self)
 static VALUE
 outputstream_write_all(int argc, VALUE *argv, VALUE self)
 {
-        VALUE rbbuffer, rbcancellable;
+        VALUE rbbuffer, cancellable;
         const char *buffer;
-        gsize count;
         gsize bytes_written;
-        GCancellable *cancellable;
         GError *error = NULL;
 
-        rb_scan_args(argc, argv, "11", &rbbuffer, &rbcancellable);
+        rb_scan_args(argc, argv, "11", &rbbuffer, &cancellable);
         buffer = RVAL2CSTR(rbbuffer);
-        count = RSTRING_LEN(rbbuffer);
-        cancellable = RVAL2GCANCELLABLE(rbcancellable);
         if (!g_output_stream_write_all(_SELF(self),
                                        buffer,
-                                       count,
+                                       (gsize)RSTRING_LEN(rbbuffer),
                                        &bytes_written,
-                                       cancellable,
+                                       RVAL2GCANCELLABLE(cancellable),
                                        &error))
                 rbgio_raise_error(error);
 
@@ -319,8 +311,6 @@ Init_goutputstream(VALUE glib)
         G_DEF_CLASS(G_TYPE_OUTPUT_STREAM_SPLICE_FLAGS, "SpliceFlags", outputstream);
         G_DEF_CONSTANTS(outputstream, G_TYPE_OUTPUT_STREAM_SPLICE_FLAGS, "G_OUTPUT_STREAM_");
 
-        rb_undef_alloc_func(outputstream);
-
         rb_define_method(outputstream, "write", outputstream_write, -1);
         rb_define_method(outputstream, "write_all", outputstream_write_all, -1);
         rb_define_method(outputstream, "splice", outputstream_splice, -1);

data/ext/gio2/gresolver.c

@@ -209,8 +209,6 @@ Init_gresolver(VALUE glib)
         rb_define_singleton_method(resolver, "default", resolver_get_default, 0);
         rb_define_singleton_method(resolver, "set_default", resolver_set_default, 1);
 
-        rb_undef_alloc_func(resolver);
-
         /* TODO: Taint result of these methods? */
         rb_define_method(resolver, "lookup_by_name", resolver_lookup_by_name, 2);
         rb_define_method(resolver, "lookup_by_name_async", resolver_lookup_by_name_async, -1);

data/ext/gio2/gsocket.c

@@ -298,60 +298,7 @@ socket_condition_wait(int argc, VALUE *argv, VALUE self)
         return self;
 }
 
-static VALUE
-socket_set_listen_backlog(VALUE self, VALUE backlog)
-{
-        g_socket_set_listen_backlog(_SELF(self), RVAL2GINT(backlog));
-
-        return self;
-}
-
-static VALUE
-socket_get_listen_backlog(VALUE self)
-{
-        return GINT2RVAL(g_socket_get_listen_backlog(_SELF(self)));
-}
-
-static VALUE
-socket_get_blocking(VALUE self)
-{
-        return CBOOL2RVAL(g_socket_get_blocking(_SELF(self)));
-}
-
-static VALUE
-socket_set_blocking(VALUE self, VALUE blocking)
-{
-        g_socket_set_blocking(_SELF(self), RVAL2CBOOL(blocking));
-
-        return self;
-}
-
-static VALUE
-socket_get_keepalive(VALUE self)
-{
-        return CBOOL2RVAL(g_socket_get_keepalive(_SELF(self)));
-}
-
-static VALUE
-socket_set_keepalive(VALUE self, VALUE keepalive)
-{
-        g_socket_set_keepalive(_SELF(self), RVAL2CBOOL(keepalive));
-
-        return self;
-}
-
-static VALUE
-socket_get_family(VALUE self)
-{
-        return GSOCKETFAMILY2RVAL(g_socket_get_family(_SELF(self)));
-}
-
-static VALUE
-socket_get_fd(VALUE self)
-{
-        return FD2RVAL(g_socket_get_fd(_SELF(self)));
-}
-
+/* TODO: Need to make sure that this isn’t overridden. */
 static VALUE
 socket_get_local_address(VALUE self)
 {
@@ -365,12 +312,6 @@ socket_get_local_address(VALUE self)
         return GOBJ2RVAL_UNREF(address);
 }
 
-static VALUE
-socket_get_protocol(VALUE self)
-{
-        return GSOCKETPROTOCOL2RVAL(g_socket_get_protocol(_SELF(self)));
-}
-
 static VALUE
 socket_get_remote_address(VALUE self)
 {
@@ -384,12 +325,6 @@ socket_get_remote_address(VALUE self)
         return GOBJ2RVAL_UNREF(address);
 }
 
-static VALUE
-socket_get_socket_type(VALUE self)
-{
-        return GSOCKETTYPE2RVAL(g_socket_get_socket_type(_SELF(self)));
-}
-
 static VALUE
 socket_speaks_ipv4(VALUE self)
 {
@@ -399,7 +334,7 @@ socket_speaks_ipv4(VALUE self)
 void
 Init_gsocket(VALUE glib)
 {
-        VALUE socket = G_DEF_CLASS(G_TYPE_SOCKET_ADDRESS, "Socket", glib);
+        VALUE socket = G_DEF_CLASS(G_TYPE_SOCKET, "Socket", glib);
 
         G_DEF_CLASS(G_TYPE_SOCKET_FAMILY, "Family", socket);
         G_DEF_CONSTANTS(socket, G_TYPE_SOCKET_FAMILY, "G_SOCKET_");
@@ -432,20 +367,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, "set_listen_backlog", socket_set_listen_backlog, 1);
-        G_DEF_SETTER(socket, "listen_backlog");
-        rb_define_method(socket, "listen_backlog", socket_get_listen_backlog, 0);
-        rb_define_method(socket, "blocking?", socket_get_blocking, 0);
-        rb_define_method(socket, "set_blocking", socket_set_blocking, 1);
-        G_DEF_SETTER(socket, "blocking");
-        rb_define_method(socket, "keepalive?", socket_get_keepalive, 0);
-        rb_define_method(socket, "set_keepalive", socket_set_keepalive, 1);
-        G_DEF_SETTER(socket, "keepalive");
-        rb_define_method(socket, "family", socket_get_family, 0);
-        rb_define_method(socket, "fd", socket_get_fd, 0);
         rb_define_method(socket, "local_address", socket_get_local_address, 0);
-        rb_define_method(socket, "protocol", socket_get_protocol, 0);
         rb_define_method(socket, "remote_address", socket_get_remote_address, 0);
-        rb_define_method(socket, "socket_type", socket_get_socket_type, 0);
         rb_define_method(socket, "speaks_ipv4?", socket_speaks_ipv4, 0);
 }