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

data/ext/gio2/gdataoutputstream.c

@@ -39,21 +39,6 @@ dataoutputstream_initialize(int argc, VALUE *argv, VALUE self)
         return Qnil;
 }
 
-static VALUE
-dataoutputstream_get_byte_order(VALUE self)
-{
-        return GDATASTREAMBYTEORDER2RVAL(g_data_output_stream_get_byte_order(_SELF(self)));
-}
-
-static VALUE
-dataoutputstream_set_byte_order(VALUE self, VALUE value)
-{
-        g_data_output_stream_set_byte_order(_SELF(self),
-                                            RVAL2GDATASTREAMBYTEORDER(value));
-
-        return self;
-}
-
 static VALUE
 dataoutputstream_put_byte(int argc, VALUE *argv, VALUE self)
 {
@@ -188,9 +173,6 @@ Init_gdataoutputstream(VALUE glib)
         VALUE dataoutputstream = G_DEF_CLASS(G_TYPE_DATA_OUTPUT_STREAM, "DataOutputStream", glib);
 
         rb_define_method(dataoutputstream, "initialize", dataoutputstream_initialize, -1);
-        rb_define_method(dataoutputstream, "byte_order", dataoutputstream_get_byte_order, 0);
-        rb_define_method(dataoutputstream, "set_byte_order", dataoutputstream_set_byte_order, 1);
-        G_DEF_SETTER(dataoutputstream, "byte_order");
         rb_define_method(dataoutputstream, "put_byte", dataoutputstream_put_byte, -1);
         rb_define_method(dataoutputstream, "put_int16", dataoutputstream_put_int16, -1);
         rb_define_method(dataoutputstream, "put_uint16", dataoutputstream_put_uint16, -1);

data/ext/gio2/gdesktopappinfo.c

@@ -77,8 +77,6 @@ Init_gdesktopappinfo(G_GNUC_UNUSED VALUE glib)
 #ifdef HAVE_GIO_UNIX
         VALUE desktopappinfo = G_DEF_CLASS(G_TYPE_DESKTOP_APP_INFO, "DesktopAppInfo", glib);
 
-        rb_define_const(desktopappinfo, "LOOKUP_EXTENSION_POINT_NAME", CSTR2RVAL(G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME));
-
         rb_define_singleton_method(desktopappinfo, "new_from_filename", desktopappinfo_new_from_filename, 1);
         rb_define_singleton_method(desktopappinfo, "new_from_keyfile", desktopappinfo_new_from_keyfile, 1);
         rb_define_singleton_method(desktopappinfo, "set_desktop_env", desktopappinfo_set_desktop_env, 1);

data/ext/gio2/gemblem.c

@@ -20,11 +20,6 @@
 
 #include "gio2.h"
 
-#define _SELF(value) RVAL2GEMBLEM(value)
-
-#define GEMBLEMORIGIN2RVAL(value) \
-        GENUM2RVAL((value), G_TYPE_EMBLEM_ORIGIN)
-
 #define RVAL2GEMBLEMORIGIN(value) \
         RVAL2GENUM((value), G_TYPE_EMBLEM_ORIGIN)
 
@@ -45,18 +40,6 @@ emblem_initialize(int argc, VALUE *argv, VALUE self)
         return Qnil;
 }
 
-static VALUE
-emblem_get_icon(VALUE self)
-{
-        return GOBJ2RVAL(g_emblem_get_icon(_SELF(self)));
-}
-
-static VALUE
-emblem_get_origin(VALUE self)
-{
-        return GEMBLEMORIGIN2RVAL(g_emblem_get_origin(_SELF(self)));
-}
-
 void
 Init_gemblem(VALUE glib)
 {
@@ -66,6 +49,4 @@ Init_gemblem(VALUE glib)
         G_DEF_CONSTANTS(emblem, G_TYPE_EMBLEM_ORIGIN, "G_EMBLEM_");
 
         rb_define_method(emblem, "initialize", emblem_initialize, -1);
-        rb_define_method(emblem, "icon", emblem_get_icon, 0);
-        rb_define_method(emblem, "origin", emblem_get_origin, 0);
 }

data/ext/gio2/gfile.c

@@ -1423,7 +1423,7 @@ file_start_mountable(int argc, VALUE *argv, VALUE self)
         GMountOperation *start_operation;
         GCancellable *cancellable;
 
-        rb_scan_args(argc, argv, "02&", &rbflags, &rbstart_operation, &rbcancellable, &block);
+        rb_scan_args(argc, argv, "03&", &rbflags, &rbstart_operation, &rbcancellable, &block);
         flags = RVAL2GDRIVESTARTFLAGSDEFAULT(rbflags);
         start_operation = RVAL2GMOUNTOPERATION(rbstart_operation);
         cancellable = RVAL2GCANCELLABLE(rbcancellable);
@@ -1679,16 +1679,14 @@ file_replace_contents(int argc, VALUE *argv, VALUE self)
 {
         VALUE rbcontents, etag, make_backup, flags, cancellable;
         const char *contents;
-        gsize length;
         char *new_etag;
         GError *error = NULL;
 
         rb_scan_args(argc, argv, "14", &rbcontents, &etag, &make_backup, &flags, &cancellable);
         contents = RVAL2CSTR(rbcontents);
-        length = RSTRING_LEN(rbcontents);
         if (!g_file_replace_contents(_SELF(self),
                                      contents,
-                                     length,
+                                     (gsize)RSTRING_LEN(rbcontents),
                                      RVAL2CSTR_ACCEPT_NIL(etag),
                                      RVAL2CBOOL(make_backup),
                                      RVAL2GFILECREATEFLAGSDEFAULT(flags),
@@ -1940,8 +1938,8 @@ Init_gfile(VALUE glib)
         G_DEF_CLASS(G_TYPE_FILE_MONITOR_FLAGS, "MonitorFlags", file);
         G_DEF_CONSTANTS(file, G_TYPE_FILE_MONITOR_FLAGS, "G_FILE_");
 
-        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_FILE_TYPE, "Type", file);
+        G_DEF_CONSTANTS(file, G_TYPE_FILE_TYPE, "G_FILE_");
 
         rb_define_singleton_method(file, "new_for_path", file_new_for_path, 1);
         rb_define_singleton_method(file, "new_for_uri", file_new_for_uri, 1);

data/ext/gio2/gfileattribute.c

@@ -20,141 +20,10 @@
 
 #include "gio2.h"
 
-static GFileAttributeInfo *
-fileattributeinfo_copy(const GFileAttributeInfo *info)
-{
-        return (GFileAttributeInfo *)info;
-}
-
-static void
-fileattributeinfo_free(G_GNUC_UNUSED GFileAttributeInfo *info)
-{
-        return;
-}
-
-static GType
-g_file_attribute_info_get_type(void)
-{
-        static GType our_type = 0;
-
-        if (our_type == 0)
-                our_type = g_boxed_type_register_static("GFileAttributeInfo",
-                                                        (GBoxedCopyFunc)fileattributeinfo_copy,
-                                                        (GBoxedFreeFunc)fileattributeinfo_free);
-
-        return our_type;
-}
-
-#define G_TYPE_FILE_ATTRIBUTE_INFO (g_file_attribute_info_get_type())
-
-#define RVAL2GFILEATTRIBUTEINFO(object) \
-        ((GFileAttributeInfo *)(RVAL2BOXED(object, G_TYPE_FILE_ATTRIBUTE_INFO)))
-
-#define GFILEATTRIBUTEINFO2RVAL(object) \
-        BOXED2RVAL(object, G_TYPE_FILE_ATTRIBUTE_INFO)
-
-#define _SELF(value) RVAL2GFILEATTRIBUTEINFO(value)
-
-#define GFILEATTRIBUTEINFOFLAGS2RVAL(value) \
-        GFLAGS2RVAL((value), G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS)
-
-#define RVAL2GFILEATTRIBUTEINFOFLAGS(value) \
-        RVAL2GFLAGS((value), G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS)
-
-#define RVAL2GFILEATTRIBUTEINFOFLAGSDEFAULT(value) \
-        RVAL2TYPE_WITH_DEFAULT((value), \
-                               RVAL2GFILEATTRIBUTEINFOFLAGS, \
-                               G_FILE_ATTRIBUTE_INFO_NONE)
-
-static VALUE
-fileattributeinfo_name(VALUE self)
-{
-        return CSTR2RVAL(_SELF(self)->name);
-}
-
-static VALUE
-fileattributeinfo_type(VALUE self)
-{
-        return GFILEATTRIBUTETYPE2RVAL(_SELF(self)->type);
-}
-
-static VALUE
-fileattributeinfo_flags(VALUE self)
-{
-        return GFILEATTRIBUTEINFOFLAGS2RVAL(_SELF(self)->flags);
-}
-
-#undef _SELF
-
-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_gfileattribute(VALUE glib)
 {
-        VALUE fileattribute, fileattributeinfo, fileattributeinfolist;
+        VALUE fileattribute;
 
         fileattribute = rb_define_module_under(glib, "FileAttribute");
 
@@ -231,33 +100,12 @@ Init_gfileattribute(VALUE glib)
         rb_define_const(fileattribute, "GVFS_BACKEND", CSTR2RVAL(G_FILE_ATTRIBUTE_GVFS_BACKEND));
         rb_define_const(fileattribute, "SELINUX_CONTEXT", CSTR2RVAL(G_FILE_ATTRIBUTE_SELINUX_CONTEXT));
         rb_define_const(fileattribute, "TRASH_ITEM_COUNT", CSTR2RVAL(G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT));
+        rb_define_const(fileattribute, "TRASH_DELETION_DATE", CSTR2RVAL(G_FILE_ATTRIBUTE_TRASH_DELETION_DATE));
+        rb_define_const(fileattribute, "TRASH_ORIG_PATH", CSTR2RVAL(G_FILE_ATTRIBUTE_TRASH_ORIG_PATH));
 
         G_DEF_CLASS(G_TYPE_FILE_ATTRIBUTE_TYPE, "Type", fileattribute);
         G_DEF_CONSTANTS(fileattribute, G_TYPE_FILE_ATTRIBUTE_TYPE, "G_FILE_ATTRIBUTE_");
 
-        G_DEF_CLASS(G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS, "InfoFlags", fileattribute);
-        G_DEF_CONSTANTS(fileattribute, G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS, "G_FILE_ATTRIBUTE_");
-
         G_DEF_CLASS(G_TYPE_FILE_ATTRIBUTE_STATUS, "Status", fileattribute);
         G_DEF_CONSTANTS(fileattribute, G_TYPE_FILE_ATTRIBUTE_STATUS, "G_FILE_ATTRIBUTE_");
-
-        fileattributeinfo = G_DEF_CLASS(G_TYPE_FILE_ATTRIBUTE_INFO, "Info", fileattribute);
-
-        rb_undef_alloc_func(fileattributeinfo);
-        rbgobj_boxed_not_copy_obj(G_TYPE_FILE_ATTRIBUTE_INFO);
-
-        rb_define_method(fileattributeinfo, "name", fileattributeinfo_name, 0);
-        rb_define_method(fileattributeinfo, "type", fileattributeinfo_type, 0);
-        rb_define_method(fileattributeinfo, "flags", fileattributeinfo_flags, 0);
-
-        fileattributeinfolist = G_DEF_CLASS(G_TYPE_FILE_ATTRIBUTE_INFO_LIST, "InfoList", fileattributeinfo);
-
-        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/gfileattributeinfo.c

@@ -0,0 +1,89 @@
+/* -*- 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"
+
+static GFileAttributeInfo *
+fileattributeinfo_copy(const GFileAttributeInfo *info)
+{
+        return (GFileAttributeInfo *)info;
+}
+
+static void
+fileattributeinfo_free(G_GNUC_UNUSED GFileAttributeInfo *info)
+{
+        return;
+}
+
+GType
+g_file_attribute_info_get_type(void)
+{
+        static GType our_type = 0;
+
+        if (our_type == 0)
+                our_type = g_boxed_type_register_static("GFileAttributeInfo",
+                                                        (GBoxedCopyFunc)fileattributeinfo_copy,
+                                                        (GBoxedFreeFunc)fileattributeinfo_free);
+
+        return our_type;
+}
+
+#define RVAL2GFILEATTRIBUTEINFO(object) \
+        ((GFileAttributeInfo *)(RVAL2BOXED(object, G_TYPE_FILE_ATTRIBUTE_INFO)))
+
+#define _SELF(value) RVAL2GFILEATTRIBUTEINFO(value)
+
+#define GFILEATTRIBUTEINFOFLAGS2RVAL(value) \
+        GFLAGS2RVAL((value), G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS)
+
+static VALUE
+fileattributeinfo_name(VALUE self)
+{
+        return CSTR2RVAL(_SELF(self)->name);
+}
+
+static VALUE
+fileattributeinfo_type(VALUE self)
+{
+        return GFILEATTRIBUTETYPE2RVAL(_SELF(self)->type);
+}
+
+static VALUE
+fileattributeinfo_flags(VALUE self)
+{
+        return GFILEATTRIBUTEINFOFLAGS2RVAL(_SELF(self)->flags);
+}
+
+void
+Init_gfileattributeinfo(VALUE glib)
+{
+        VALUE fileattributeinfo;
+
+        fileattributeinfo = G_DEF_CLASS(G_TYPE_FILE_ATTRIBUTE_INFO, "FileAttributeInfo", glib);
+
+        G_DEF_CLASS(G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS, "Flags", fileattributeinfo);
+        G_DEF_CONSTANTS(fileattributeinfo, G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS, "G_FILE_ATTRIBUTE_INFO_");
+
+        rbgobj_boxed_not_copy_obj(G_TYPE_FILE_ATTRIBUTE_INFO);
+
+        rb_define_method(fileattributeinfo, "name", fileattributeinfo_name, 0);
+        rb_define_method(fileattributeinfo, "type", fileattributeinfo_type, 0);
+        rb_define_method(fileattributeinfo, "flags", fileattributeinfo_flags, 0);
+}

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