gio2 0.90.5 → 0.90.6

data/ext/gio2/gfileattributeinfolist.c

@@ -0,0 +1,109 @@
+/* -*- c-file-style: "ruby" -*- */
+/*
+ * Ruby/GIO: a Ruby binding of gio-2.0.x.
+ * Copyright (C) 2008-2009  Ruby-GNOME2 Project Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "gio2.h"
+
+#define RVAL2GFILEATTRIBUTEINFOFLAGS(value) \
+        RVAL2GFLAGS((value), G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS)
+
+#define RVAL2GFILEATTRIBUTEINFOFLAGSDEFAULT(value) \
+        RVAL2TYPE_WITH_DEFAULT((value), \
+                               RVAL2GFILEATTRIBUTEINFOFLAGS, \
+                               G_FILE_ATTRIBUTE_INFO_NONE)
+
+GType
+g_file_attribute_info_list_get_type(void)
+{
+        static GType our_type = 0;
+        if (our_type == 0)
+                our_type = g_boxed_type_register_static("GFileAttributeInfoList",
+                                                        (GBoxedCopyFunc)g_file_attribute_info_list_ref,
+                                                        (GBoxedFreeFunc)g_file_attribute_info_list_unref);
+        return our_type;
+}
+
+#define RVAL2GFILEATTRIBUTEINFOLIST(object) \
+        ((GFileAttributeInfoList *)(RVAL2BOXED(object, G_TYPE_FILE_ATTRIBUTE_INFO_LIST)))
+
+#define _SELF(value) RVAL2GFILEATTRIBUTEINFOLIST(value)
+
+static VALUE
+fileattributeinfolist_initialize(VALUE self)
+{
+        G_INITIALIZE(self, g_file_attribute_info_list_new());
+
+        return Qnil;
+}
+
+static VALUE
+fileattributeinfolist_dup(VALUE self)
+{
+        return GFILEATTRIBUTEINFOLIST2RVAL(g_file_attribute_info_list_dup(_SELF(self)));
+}
+
+static VALUE
+fileattributeinfolist_lookup(VALUE self, VALUE name)
+{
+        /* TODO: How do we deal with the const? */
+        return GFILEATTRIBUTEINFO2RVAL((GFileAttributeInfo *)g_file_attribute_info_list_lookup(_SELF(self),
+                                                                                               RVAL2CSTR(name)));
+}
+
+static VALUE
+fileattributeinfolist_add(int argc, VALUE *argv, VALUE self)
+{
+        VALUE name, type, flags;
+
+        rb_scan_args(argc, argv, "21", &name, &type, &flags);
+
+        g_file_attribute_info_list_add(_SELF(self),
+                                       RVAL2CSTR(name),
+                                       RVAL2GFILEATTRIBUTETYPE(type),
+                                       RVAL2GFILEATTRIBUTEINFOFLAGSDEFAULT(flags));
+
+        return self;
+}
+
+static VALUE
+fileattributeinfolist_each(VALUE self)
+{
+        GFileAttributeInfoList *list = RVAL2GFILEATTRIBUTEINFOLIST(self);
+        int i;
+
+        for (i = 0; i < list->n_infos; i++)
+                rb_yield(GFILEATTRIBUTEINFO2RVAL(&list->infos[i]));
+
+        return self;
+}
+
+void
+Init_fileattributeinfolist(VALUE glib)
+{
+        VALUE fileattributeinfolist = G_DEF_CLASS(G_TYPE_FILE_ATTRIBUTE_INFO_LIST, "FileAttributeInfoList", glib);
+
+        rb_include_module(fileattributeinfolist, rb_mEnumerable);
+
+        rb_define_method(fileattributeinfolist, "initialize", fileattributeinfolist_initialize, 0);
+        rb_define_method(fileattributeinfolist, "dup", fileattributeinfolist_dup, 0);
+        rb_define_method(fileattributeinfolist, "lookup", fileattributeinfolist_lookup, 1);
+        rb_define_alias(fileattributeinfolist, "[]", "lookup");
+        rb_define_method(fileattributeinfolist, "add", fileattributeinfolist_add, 3);
+        rb_define_method(fileattributeinfolist, "each", fileattributeinfolist_each, 0);
+}

data/ext/gio2/gfileenumerator.c

@@ -151,8 +151,6 @@ Init_gfileenumerator(VALUE glib)
 {
         VALUE fileenumerator = G_DEF_CLASS(G_TYPE_FILE_ENUMERATOR, "FileEnumerator", glib);
 
-        rb_undef_alloc_func(fileenumerator);
-
         rb_define_method(fileenumerator, "next_file", fileenumerator_next_file, -1);
         rb_define_method(fileenumerator, "close", fileenumerator_close, -1);
         rb_define_method(fileenumerator, "next_files_async", fileenumerator_next_files_async, -1);

data/ext/gio2/gfileicon.c

@@ -30,17 +30,10 @@ fileicon_initialize(VALUE self, VALUE file)
         return Qnil;
 }
 
-static VALUE
-fileicon_get_file(VALUE self)
-{
-        return GOBJ2RVAL(g_file_icon_get_file(_SELF(self)));
-}
-
 void
 Init_gfileicon(VALUE glib)
 {
         VALUE fileicon = G_DEF_CLASS(G_TYPE_FILE_ICON, "FileIcon", glib);
 
         rb_define_method(fileicon, "initialize", fileicon_initialize, 1);
-        rb_define_method(fileicon, "file", fileicon_get_file, 0);
 }

data/ext/gio2/gfileinfo.c

@@ -45,7 +45,6 @@ fileinfo_dup(VALUE self)
         return GOBJ2RVAL_UNREF(g_file_info_dup(_SELF(self)));
 }
 
-/* TODO: Does this make sense from the Ruby side? */
 static VALUE
 fileinfo_copy_into(VALUE self, VALUE other)
 {
@@ -172,8 +171,8 @@ fileinfo_get_attribute_string(VALUE self, VALUE attribute)
 static VALUE
 fileinfo_get_attribute_stringv(VALUE self, VALUE attribute)
 {
-        return STRVECTOR2ARY_FREE(g_file_info_get_attribute_stringv(_SELF(self),
-                                                                    RVAL2CSTR(attribute)));
+        return STRVECTOR2ARY((const gchar * const *)g_file_info_get_attribute_stringv(_SELF(self),
+                                                                                     RVAL2CSTR(attribute)));
 }
 
 static VALUE
@@ -242,8 +241,6 @@ fileinfo_get_attribute_value(VALUE self, VALUE attribute)
         return file_attribute_to_value(type, value);
 }
 
-/* TODO: Do we need set_attribute? */
-
 static VALUE
 fileinfo_set_attribute_string(VALUE self, VALUE attribute, VALUE value)
 {
@@ -324,8 +321,6 @@ fileinfo_set_attribute_object(VALUE self, VALUE attribute, VALUE value)
         return self;
 }
 
-/* TODO: How do we implement set_attribute_value? */
-
 static VALUE
 fileinfo_clear_status(VALUE self)
 {
@@ -562,15 +557,13 @@ Init_gfileinfo(VALUE glib)
 {
         VALUE fileinfo = G_DEF_CLASS(G_TYPE_FILE_INFO, "FileInfo", glib);
 
-        G_DEF_CLASS(G_TYPE_FILE_TYPE, "FileType", glib);
-        G_DEF_CONSTANTS(glib, G_TYPE_FILE_TYPE, "G_FILE_");
-
         rb_define_method(fileinfo, "initialize", fileinfo_initialize, 0);
         rb_define_method(fileinfo, "dup", fileinfo_dup, 0);
         rb_define_method(fileinfo, "copy_into", fileinfo_copy_into, 1);
         rb_define_method(fileinfo, "has_attribute?", fileinfo_has_attribute, 1);
         rb_define_method(fileinfo, "has_namespace?", fileinfo_has_namespace, 1);
-        rb_define_method(fileinfo, "attributes", fileinfo_list_attributes, -1);
+        rb_define_method(fileinfo, "list_attributes", fileinfo_list_attributes, -1);
+        rb_define_alias(fileinfo, "attributes", "list_attributes");
         rb_define_method(fileinfo, "get_attribute_type", fileinfo_get_attribute_type, 1);
         rb_define_method(fileinfo, "remove_attribute", fileinfo_remove_attribute, 1);
         rb_define_method(fileinfo, "get_attribute_as_string", fileinfo_get_attribute_as_string, 1);

data/ext/gio2/gfileinputstream.c

@@ -84,8 +84,6 @@ Init_gfileinputstream(VALUE glib)
 {
         VALUE fileinputstream = G_DEF_CLASS(G_TYPE_FILE_INPUT_STREAM, "FileInputStream", glib);
 
-        rb_undef_alloc_func(fileinputstream);
-
         rb_define_method(fileinputstream, "query_info", fileinputstream_query_info, -1);
         rb_define_method(fileinputstream, "query_info_async", fileinputstream_query_info_async, -1);
         rb_define_method(fileinputstream, "query_info_finish", fileinputstream_query_info_finish, 1);

data/ext/gio2/gfileiostream.c

@@ -89,8 +89,6 @@ Init_gfileiostream(VALUE glib)
 {
         VALUE fileiostream = G_DEF_CLASS(G_TYPE_FILE_IO_STREAM, "FileIOStream", glib);
 
-        rb_undef_alloc_func(fileiostream);
-
         rb_define_method(fileiostream, "etag", fileiostream_get_etag, 0);
         rb_define_method(fileiostream, "query_info", fileiostream_query_info, -1);
         rb_define_method(fileiostream, "query_info_async", fileiostream_query_info_async, -1);

data/ext/gio2/gfilemonitor.c

@@ -28,20 +28,6 @@ filemonitor_cancel(VALUE self)
         return CBOOL2RVAL(g_file_monitor_cancel(_SELF(self)));
 }
 
-static VALUE
-filemonitor_is_cancelled(VALUE self)
-{
-        return CBOOL2RVAL(g_file_monitor_is_cancelled(_SELF(self)));
-}
-
-static VALUE
-filemonitor_set_rate_limit(VALUE self, VALUE rate_limit)
-{
-        g_file_monitor_set_rate_limit(_SELF(self), FIX2INT(rate_limit));
-
-        return self;
-}
-
 void
 Init_gfilemonitor(VALUE glib)
 {
@@ -53,11 +39,6 @@ Init_gfilemonitor(VALUE glib)
         G_DEF_CLASS(G_TYPE_FILE_MONITOR_FLAGS, "Flags", filemonitor);
         G_DEF_CONSTANTS(filemonitor, G_TYPE_FILE_MONITOR_FLAGS, "G_FILE_MONITOR_");
 
-        rb_undef_alloc_func(filemonitor);
-
         rb_define_method(filemonitor, "cancel", filemonitor_cancel, 0);
-        rb_define_method(filemonitor, "cancelled?", filemonitor_is_cancelled, 0);
-        rb_define_method(filemonitor, "set_rate_limit", filemonitor_set_rate_limit, 1);
-        G_DEF_SETTER(filemonitor, "rate_limit");
         /* TODO: Do we need #emit_event? */
 }

data/ext/gio2/gfileoutputstream.c

@@ -87,11 +87,7 @@ fileoutputstream_get_etag(VALUE self)
 void
 Init_gfileoutputstream(VALUE glib)
 {
-        VALUE fileoutputstream = G_DEF_CLASS(G_TYPE_FILE_OUTPUT_STREAM,
-                                             "FileOutputStream",
-                                             glib);
-
-        rb_undef_alloc_func(fileoutputstream);
+        VALUE fileoutputstream = G_DEF_CLASS(G_TYPE_FILE_OUTPUT_STREAM, "FileOutputStream", glib);
 
         rb_define_method(fileoutputstream, "query_info", fileoutputstream_query_info, -1);
         rb_define_method(fileoutputstream, "query_info_async", fileoutputstream_query_info_async, -1);

data/ext/gio2/gfilterinputstream.c

@@ -20,37 +20,8 @@
 
 #include "gio2.h"
 
-#define _SELF(value) G_FILTER_INPUT_STREAM(RVAL2GOBJ(value))
-
-static VALUE
-filterinputstream_get_base_stream(VALUE self)
-{
-        return GOBJ2RVAL(g_filter_input_stream_get_base_stream(_SELF(self)));
-}
-
-static VALUE
-filterinputstream_get_close_base_stream(VALUE self)
-{
-        return CBOOL2RVAL(g_filter_input_stream_get_close_base_stream(_SELF(self)));
-}
-
-static VALUE
-filterinputstream_set_close_base_stream(VALUE self, VALUE close_base)
-{
-        g_filter_input_stream_set_close_base_stream(_SELF(self), RVAL2CBOOL(close_base));
-
-        return self;
-}
-
 void
 Init_gfilterinputstream(VALUE glib)
 {
-        VALUE filterinputstream = G_DEF_CLASS(G_TYPE_FILTER_INPUT_STREAM, "FilterInputStream", glib);
-
-        rb_undef_alloc_func(filterinputstream);
-
-        rb_define_method(filterinputstream, "base_stream", filterinputstream_get_base_stream, 0);
-        rb_define_method(filterinputstream, "close_base_stream?", filterinputstream_get_close_base_stream, 0);
-        rb_define_method(filterinputstream, "set_close_base_stream", filterinputstream_set_close_base_stream, 1);
-        G_DEF_SETTER(filterinputstream, "close_base_stream");
+        (void)G_DEF_CLASS(G_TYPE_FILTER_INPUT_STREAM, "FilterInputStream", glib);
 }

data/ext/gio2/gfilteroutputstream.c

@@ -20,37 +20,8 @@
 
 #include "gio2.h"
 
-#define _SELF(value) G_FILTER_OUTPUT_STREAM(RVAL2GOBJ(value))
-
-static VALUE
-filteroutputstream_get_base_stream(VALUE self)
-{
-        return GOBJ2RVAL(g_filter_output_stream_get_base_stream(_SELF(self)));
-}
-
-static VALUE
-filteroutputstream_get_close_base_stream(VALUE self)
-{
-        return CBOOL2RVAL(g_filter_output_stream_get_close_base_stream(_SELF(self)));
-}
-
-static VALUE
-filteroutputstream_set_close_base_stream(VALUE self, VALUE close_base)
-{
-        g_filter_output_stream_set_close_base_stream(_SELF(self), RVAL2CBOOL(close_base));
-
-        return self;
-}
-
 void
 Init_gfilteroutputstream(VALUE glib)
 {
-        VALUE filteroutputstream = G_DEF_CLASS(G_TYPE_FILTER_OUTPUT_STREAM, "FilterOutputStream", glib);
-
-        rb_undef_alloc_func(filteroutputstream);
-
-        rb_define_method(filteroutputstream, "base_stream", filteroutputstream_get_base_stream, 0);
-        rb_define_method(filteroutputstream, "close_base_stream?", filteroutputstream_get_close_base_stream, 0);
-        rb_define_method(filteroutputstream, "set_close_base_stream", filteroutputstream_set_close_base_stream, 1);
-        G_DEF_SETTER(filteroutputstream, "close_base_stream");
+        (void)G_DEF_CLASS(G_TYPE_FILTER_OUTPUT_STREAM, "FilterOutputStream", glib);
 }

data/ext/gio2/gicon.c

@@ -50,7 +50,6 @@ icon_equal(VALUE self, VALUE other)
 static VALUE
 icon_to_string(VALUE self)
 {
-        /* TODO: Should we raise if it returns NULL? */
         return CSTR2RVAL_FREE(g_icon_to_string(_SELF(self)));
 }
 
@@ -64,6 +63,5 @@ Init_gicon(VALUE glib)
         rb_define_method(icon, "hash", icon_hash, 0);
         rb_define_method(icon, "==", icon_equal, 1);
         rb_define_method(icon, "to_string", icon_to_string, 0);
-        rb_define_alias(icon, "to_str", "to_string");
         rb_define_alias(icon, "to_s", "to_string");
 }

data/ext/gio2/ginetaddress.c

@@ -98,66 +98,6 @@ inetaddress_to_string(VALUE self)
         return CSTR2RVAL_FREE(g_inet_address_to_string(_SELF(self)));
 }
 
-static VALUE
-inetaddress_get_family(VALUE self)
-{
-        return GSOCKETFAMILY2RVAL(g_inet_address_get_family(_SELF(self)));
-}
-
-static VALUE
-inetaddress_get_is_any(VALUE self)
-{
-        return CBOOL2RVAL(g_inet_address_get_is_any(_SELF(self)));
-}
-
-static VALUE
-inetaddress_get_is_loopback(VALUE self)
-{
-        return CBOOL2RVAL(g_inet_address_get_is_loopback(_SELF(self)));
-}
-
-static VALUE
-inetaddress_get_is_link_local(VALUE self)
-{
-        return CBOOL2RVAL(g_inet_address_get_is_link_local(_SELF(self)));
-}
-
-static VALUE
-inetaddress_get_is_site_local(VALUE self)
-{
-        return CBOOL2RVAL(g_inet_address_get_is_site_local(_SELF(self)));
-}
-
-static VALUE
-inetaddress_get_is_multicast(VALUE self)
-{
-        return CBOOL2RVAL(g_inet_address_get_is_multicast(_SELF(self)));
-}
-
-static VALUE
-inetaddress_get_is_mc_link_local(VALUE self)
-{
-        return CBOOL2RVAL(g_inet_address_get_is_mc_link_local(_SELF(self)));
-}
-
-static VALUE
-inetaddress_get_is_mc_node_local(VALUE self)
-{
-        return CBOOL2RVAL(g_inet_address_get_is_mc_node_local(_SELF(self)));
-}
-
-static VALUE
-inetaddress_get_is_mc_site_local(VALUE self)
-{
-        return CBOOL2RVAL(g_inet_address_get_is_mc_site_local(_SELF(self)));
-}
-
-static VALUE
-inetaddress_get_is_mc_global(VALUE self)
-{
-        return CBOOL2RVAL(g_inet_address_get_is_mc_global(_SELF(self)));
-}
-
 void
 Init_ginetaddress(VALUE glib)
 {
@@ -168,21 +108,9 @@ Init_ginetaddress(VALUE glib)
         rb_define_singleton_method(inetaddress, "new_any", inetaddress_new_any, 1);
         rb_define_singleton_method(inetaddress, "new_loopback", inetaddress_new_loopback, 1);
 
-        rb_undef_alloc_func(inetaddress);
-
         rb_define_method(inetaddress, "to_bytes", inetaddress_to_bytes, 0);
         rb_define_method(inetaddress, "get_native_size", inetaddress_get_native_size, 0);
         rb_define_method(inetaddress, "to_string", inetaddress_to_string, 0);
         rb_define_alias(inetaddress, "to_str", "to_string");
         rb_define_alias(inetaddress, "to_s", "to_string");
-        rb_define_method(inetaddress, "family", inetaddress_get_family, 0);
-        rb_define_method(inetaddress, "any?", inetaddress_get_is_any, 0);
-        rb_define_method(inetaddress, "loopback?", inetaddress_get_is_loopback, 0);
-        rb_define_method(inetaddress, "link_local?", inetaddress_get_is_link_local, 0);
-        rb_define_method(inetaddress, "site_local?", inetaddress_get_is_site_local, 0);
-        rb_define_method(inetaddress, "multicast?", inetaddress_get_is_multicast, 0);
-        rb_define_method(inetaddress, "mc_link_local?", inetaddress_get_is_mc_link_local, 0);
-        rb_define_method(inetaddress, "mc_node_local?", inetaddress_get_is_mc_node_local, 0);
-        rb_define_method(inetaddress, "mc_site_local?", inetaddress_get_is_mc_site_local, 0);
-        rb_define_method(inetaddress, "mc_global?", inetaddress_get_is_mc_global, 0);
 }

data/ext/gio2/ginetsocketaddress.c

@@ -20,8 +20,6 @@
 
 #include "gio2.h"
 
-#define _SELF(value) G_INET_SOCKET_ADDRESS(RVAL2GOBJ(value))
-
 static VALUE
 inetsocketaddress_initialize(VALUE self, VALUE address, VALUE port)
 {
@@ -31,24 +29,10 @@ inetsocketaddress_initialize(VALUE self, VALUE address, VALUE port)
         return Qnil;
 }
 
-static VALUE
-inetsocketaddress_get_address(VALUE self)
-{
-        return GOBJ2RVAL(g_inet_socket_address_get_address(_SELF(self)));
-}
-
-static VALUE
-inetsocketaddress_get_port(VALUE self)
-{
-        return GUINT162RVAL(g_inet_socket_address_get_port(_SELF(self)));
-}
-
 void
 Init_ginetsocketaddress(VALUE glib)
 {
         VALUE inetsocketaddress = G_DEF_CLASS(G_TYPE_INET_SOCKET_ADDRESS, "InetSocketAddress", glib);
 
         rb_define_method(inetsocketaddress, "initialize", inetsocketaddress_initialize, 2);
-        rb_define_method(inetsocketaddress, "address", inetsocketaddress_get_address, 0);
-        rb_define_method(inetsocketaddress, "port", inetsocketaddress_get_port, 0);
 }

data/ext/gio2/ginputstream.c

@@ -322,8 +322,6 @@ Init_ginputstream(VALUE glib)
 
         s_cReadAsyncResult = rb_define_class_under(inputstream, "ReadAsyncResult", rb_cObject);
         
-        rb_undef_alloc_func(inputstream);
-
         rb_define_method(inputstream, "read", inputstream_read, -1);
         rb_define_method(inputstream, "read_all", inputstream_read_all, -1);
         rb_define_method(inputstream, "skip", inputstream_skip, -1);

data/ext/gio2/gio2.c

@@ -37,6 +37,15 @@ Init_gio2(void)
 {
         VALUE glib = mGLib;
 
+        G_DEF_CLASS(G_TYPE_FILESYSTEM_PREVIEW_TYPE, "FilesystemPreviewType", glib);
+        G_DEF_CONSTANTS(glib, G_TYPE_FILESYSTEM_PREVIEW_TYPE, "G_");
+
+        G_DEF_CLASS(G_TYPE_DATA_STREAM_BYTE_ORDER, "DataStreamByteOrder", glib);
+        G_DEF_CONSTANTS(glib, G_TYPE_DATA_STREAM_BYTE_ORDER, "G_");
+
+        G_DEF_CLASS(G_TYPE_DATA_STREAM_NEWLINE_TYPE, "DataStreamNewlineType", glib);
+        G_DEF_CONSTANTS(glib, G_TYPE_DATA_STREAM_NEWLINE_TYPE, "G_");
+
         rb_define_module_function(glib, "gio_has_unix?", gio_has_unix, 0);
 
         Init_util();
@@ -55,13 +64,14 @@ Init_gio2(void)
         Init_gconverteroutputstream(glib);
         Init_gdatainputstream(glib);
         Init_gdesktopappinfo(glib);
-        Init_gfileattributematcher(glib);
         Init_gdataoutputstream(glib);
         Init_gdrive(glib);
         Init_gemblem(glib);
         Init_gemblemedicon(glib);
         Init_gfile(glib);
         Init_gfileattribute(glib);
+        Init_gfileattributeinfo(glib);
+        Init_gfileattributematcher(glib);
         Init_gfiledescriptorbased(glib);
         Init_gfileenumerator(glib);
         Init_gfileicon(glib);

data/ext/gio2/gio2.h

@@ -84,8 +84,14 @@ GType g_file_attribute_matcher_get_type(void);
 #define GFILEATTRIBUTETYPE2RVAL(value) \
         GENUM2RVAL((value), G_TYPE_FILE_ATTRIBUTE_TYPE)
 
+#define GFILEATTRIBUTEINFO2RVAL(object) \
+        BOXED2RVAL(object, G_TYPE_FILE_ATTRIBUTE_INFO)
+
+#define G_TYPE_FILE_ATTRIBUTE_INFO (g_file_attribute_info_get_type())
+GType g_file_attribute_info_get_type(void);
+
 #define G_TYPE_FILE_ATTRIBUTE_INFO_LIST (g_file_attribute_info_list_get_type())
-GType g_file_attribute_info_list_get_type();
+GType g_file_attribute_info_list_get_type(void);
 
 #define GFILEATTRIBUTEINFOLIST2RVAL(object) \
         BOXED2RVAL(object, G_TYPE_FILE_ATTRIBUTE_INFO_LIST)
@@ -278,6 +284,8 @@ G_GNUC_INTERNAL void Init_gemblem(VALUE glib);
 G_GNUC_INTERNAL void Init_gemblemedicon(VALUE glib);
 G_GNUC_INTERNAL void Init_gfile(VALUE glib);
 G_GNUC_INTERNAL void Init_gfileattribute(VALUE glib);
+G_GNUC_INTERNAL void Init_gfileattributeinfo(VALUE glib);
+G_GNUC_INTERNAL void Init_fileattributeinfolist(VALUE glib);
 G_GNUC_INTERNAL void Init_gfileattributematcher(VALUE glib);
 G_GNUC_INTERNAL void Init_gfiledescriptorbased(VALUE glib);
 G_GNUC_INTERNAL void Init_gfileenumerator(VALUE glib);

data/ext/gio2/gioerror.c

@@ -27,7 +27,6 @@ Init_gioerror(VALUE glib)
 {
         VALUE io, error;
         
-        /* TODO: Is this naming scheme correct/the best? */
         io = rb_define_module_under(glib, "IO");
 
         error = rbgio_define_domain_error(io, "Error", G_IO_ERROR, "GIOErrorEnum", rb_eIOError);
@@ -64,4 +63,8 @@ Init_gioerror(VALUE glib)
         rbgio_define_error(io, "WouldMergeError", G_IO_ERROR_WOULD_MERGE, error);
         rbgio_define_error(io, "FailedHandledError", G_IO_ERROR_FAILED_HANDLED, error);
         rbgio_define_error(io, "TooManyOpenFilesError", G_IO_ERROR_TOO_MANY_OPEN_FILES, error);
+        rbgio_define_error(io, "NotInitializedError", G_IO_ERROR_NOT_INITIALIZED, error);
+        rbgio_define_error(io, "AddressInUseError", G_IO_ERROR_ADDRESS_IN_USE, error);
+        rbgio_define_error(io, "PartialInputError", G_IO_ERROR_PARTIAL_INPUT, error);
+        rbgio_define_error(io, "InvalidDataError", G_IO_ERROR_INVALID_DATA, error);
 }

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);