updated to currrent git regenerated

2007-09-06  Juerg Billeter  <j@bitron.ch>

	* vapi/packages/gio-standalone/: updated to currrent git
	* vapi/gio-standalone.vala: regenerated

svn path=/trunk/; revision=586

diff --git a/ChangeLog b/ChangeLog
index c262936..a6419aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-06  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/packages/gio-standalone/: updated to currrent git
+       * vapi/gio-standalone.vala: regenerated
+
 2007-09-06  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
 
        * vapi/packages/gnet-2.0/*: create bindings for gnet-2.0

diff --git a/vapi/gio-standalone.vala b/vapi/gio-standalone.vala
index 4d7b79a..b48d142 100644 (file)
--- a/vapi/gio-standalone.vala
+++ b/vapi/gio-standalone.vala
@@ -2,35 +2,49 @@
 
 [CCode (cprefix = "G", lower_case_cprefix = "g_")]
 namespace GLib {
-       [CCode (cprefix = "G_DIRECTORY_MONITOR_EVENT_", cheader_filename = "gio/gvfs.h")]
-       public enum DirectoryMonitorEvent {
-               CHANGED,
-               DELETED,
-               CREATED,
-               ATTRIBUTE_CHANGED,
-               UNMOUNTED,
+       [CCode (cprefix = "G_DATA_STREAM_BYTE_ORDER_", cheader_filename = "gio/gvfs.h")]
+       public enum DataStreamByteOrder {
+               BIG_ENDIAN,
+               LITTLE_ENDIAN,
+               HOST_ENDIAN,
+       }
+       [CCode (cprefix = "G_DATA_STREAM_NEWLINE_TYPE_", cheader_filename = "gio/gvfs.h")]
+       public enum DataStreamNewlineType {
+               LF,
+               CR,
+               CR_LF,
+               ANY,
+       }
+       [CCode (cprefix = "G_FILE_ATTRIBUTE_FLAGS_", cheader_filename = "gio/gvfs.h")]
+       public enum FileAttributeFlags {
+               NONE,
+               COPY_WITH_FILE,
+               COPY_WHEN_MOVED,
+       }
+       [CCode (cprefix = "G_FILE_ATTRIBUTE_STATUS_", cheader_filename = "gio/gvfs.h")]
+       public enum FileAttributeStatus {
+               UNSET,
+               SET,
+               ERROR_SETTING,
        }
        [CCode (cprefix = "G_FILE_ATTRIBUTE_TYPE_", cheader_filename = "gio/gvfs.h")]
        public enum FileAttributeType {
                INVALID,
                STRING,
                BYTE_STRING,
+               BOOLEAN,
                UINT32,
                INT32,
                UINT64,
                INT64,
+               OBJECT,
        }
        [CCode (cprefix = "G_FILE_COPY_", cheader_filename = "gio/gvfs.h")]
        public enum FileCopyFlags {
                OVERWRITE,
                BACKUP,
-       }
-       [CCode (cprefix = "G_FILE_FLAG_", cheader_filename = "gio/gvfs.h")]
-       public enum FileFlags {
-               HIDDEN,
-               SYMLINK,
-               LOCAL,
-               VIRTUAL,
+               NOFOLLOW_SYMLINKS,
+               ALL_METADATA,
        }
        [CCode (cprefix = "G_FILE_GET_INFO_NOFOLLOW_", cheader_filename = "gio/gvfs.h")]
        public enum FileGetInfoFlags {
@@ -39,11 +53,18 @@ namespace GLib {
        [CCode (cprefix = "G_FILE_MONITOR_EVENT_", cheader_filename = "gio/gvfs.h")]
        public enum FileMonitorEvent {
                CHANGED,
+               CHANGES_DONE_HINT,
                DELETED,
                CREATED,
                ATTRIBUTE_CHANGED,
+               PRE_UNMOUNT,
                UNMOUNTED,
        }
+       [CCode (cprefix = "G_FILE_MONITOR_FLAGS_", cheader_filename = "gio/gvfs.h")]
+       public enum FileMonitorFlags {
+               NONE,
+               MONITOR_MOUNTS,
+       }
        [CCode (cprefix = "G_FILE_TYPE_", cheader_filename = "gio/gvfs.h")]
        public enum FileType {
                UNKNOWN,
@@ -79,8 +100,11 @@ namespace GLib {
                PENDING,
                READ_ONLY,
                CANT_CREATE_BACKUP,
-               WRONG_MTIME,
+               WRONG_ETAG,
                TIMED_OUT,
+               WOULD_RECURSE,
+               BUSY,
+               WOULD_BLOCK,
        }
        [CCode (cprefix = "G_PASSWORD_FLAGS_", cheader_filename = "gio/gvfs.h")]
        public enum PasswordFlags {
@@ -113,32 +137,84 @@ namespace GLib {
                HD,
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
+       public class IOModule : GLib.TypeModule {
+               public static GLib.Type get_type ();
+               public void load ();
+               public IOModule (string filename);
+               public void unload ();
+       }
+       [CCode (cheader_filename = "gio/gvfs.h")]
        public class BufferedInputStream : GLib.FilterInputStream {
+               public virtual long fill (long count, GLib.Cancellable cancellable) throws GLib.Error;
+               public virtual void fill_async (long count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public virtual long fill_finish (GLib.AsyncResult result) throws GLib.Error;
+               public ulong get_availible ();
+               public ulong get_buffer_size ();
                public static GLib.Type get_type ();
                public BufferedInputStream (GLib.InputStream base_stream);
-               public BufferedInputStream.sized (GLib.InputStream base_stream, uint size);
-               [NoAccessorMethod]
-               public weak uint buffer_size { get; construct; }
+               public BufferedInputStream.sized (GLib.InputStream base_stream, ulong size);
+               public ulong peek (pointer buffer, ulong offset, ulong count);
+               public void set_buffer_size (ulong size);
+               public weak uint buffer_size { get; set construct; }
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class BufferedOutputStream : GLib.FilterOutputStream {
+               public bool get_auto_grow ();
+               public ulong get_buffer_size ();
                public static GLib.Type get_type ();
                public BufferedOutputStream (GLib.OutputStream base_stream);
                public BufferedOutputStream.sized (GLib.OutputStream base_stream, uint size);
-               [NoAccessorMethod]
+               public void set_auto_grow (bool auto_grow);
+               public void set_buffer_size (ulong size);
                public weak uint buffer_size { get; construct; }
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class Cancellable : GLib.Object {
                public void cancel ();
+               public static weak GLib.Cancellable get_current ();
                public int get_fd ();
                public static GLib.Type get_type ();
                public bool is_cancelled ();
                public Cancellable ();
                public void reset ();
+               public bool set_error_if_cancelled () throws GLib.Error;
                public signal void cancelled ();
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
+       public class DataInputStream : GLib.BufferedInputStream {
+               public uchar get_byte (GLib.Cancellable cancellable) throws GLib.Error;
+               public GLib.DataStreamByteOrder get_byte_order ();
+               public short get_int16 (GLib.Cancellable cancellable) throws GLib.Error;
+               public int get_int32 (GLib.Cancellable cancellable) throws GLib.Error;
+               public int64 get_int64 (GLib.Cancellable cancellable) throws GLib.Error;
+               public weak string get_line (ulong length, GLib.Cancellable cancellable) throws GLib.Error;
+               public GLib.DataStreamNewlineType get_newline_type ();
+               public static GLib.Type get_type ();
+               public ushort get_uint16 (GLib.Cancellable cancellable) throws GLib.Error;
+               public uint get_uint32 (GLib.Cancellable cancellable) throws GLib.Error;
+               public uint64 get_uint64 (GLib.Cancellable cancellable) throws GLib.Error;
+               public weak string get_until (char stop_char, ulong length, GLib.Cancellable cancellable) throws GLib.Error;
+               public DataInputStream (GLib.InputStream base_stream);
+               public void set_byte_order (GLib.DataStreamByteOrder order);
+               public void set_newline_type (GLib.DataStreamNewlineType type);
+       }
+       [CCode (cheader_filename = "gio/gvfs.h")]
+       public class DataOutputStream : GLib.FilterOutputStream {
+               public GLib.DataStreamByteOrder get_byte_order ();
+               public static GLib.Type get_type ();
+               public DataOutputStream (GLib.OutputStream base_stream);
+               public bool put_byte (uchar data, GLib.Cancellable cancellable) throws GLib.Error;
+               public bool put_int16 (short data, GLib.Cancellable cancellable) throws GLib.Error;
+               public bool put_int32 (int data, GLib.Cancellable cancellable) throws GLib.Error;
+               public bool put_int64 (int64 data, GLib.Cancellable cancellable) throws GLib.Error;
+               public bool put_string (string str, GLib.Cancellable cancellable) throws GLib.Error;
+               public bool put_uint16 (ushort data, GLib.Cancellable cancellable) throws GLib.Error;
+               public bool put_uint32 (uint data, GLib.Cancellable cancellable) throws GLib.Error;
+               public bool put_uint64 (uint64 data, GLib.Cancellable cancellable) throws GLib.Error;
+               public void set_byte_order (GLib.DataStreamByteOrder order);
+               public void set_expand_buffer (bool expand_buffer);
+       }
+       [CCode (cheader_filename = "gio/gvfs.h")]
        public class DesktopAppInfo : GLib.Object, GLib.AppInfo {
                public static GLib.Type get_type ();
                public DesktopAppInfo (string desktop_id);
@@ -146,21 +222,28 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class DirectoryMonitor : GLib.Object {
                public virtual bool cancel ();
-               public void emit_event (GLib.File child, GLib.File other_file, GLib.DirectoryMonitorEvent event_type);
                public static GLib.Type get_type ();
+               public bool is_cancelled ();
                public void set_rate_limit (int limit_msecs);
-               public signal void changed (GLib.File child, GLib.File other_file, GLib.DirectoryMonitorEvent event_type);
+               public signal void changed (GLib.File child, GLib.File other_file, GLib.FileMonitorEvent event_type);
+       }
+       [CCode (cheader_filename = "gio/gvfs.h")]
+       public class DummyFile : GLib.Object, GLib.File {
+               public static GLib.Type get_type ();
+               public DummyFile (string uri);
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class FileEnumerator : GLib.Object {
+               public virtual bool close (GLib.Cancellable cancellable) throws GLib.Error;
+               public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public virtual bool close_finish (GLib.AsyncResult res) throws GLib.Error;
                public static GLib.Type get_type ();
                public bool has_pending ();
-               public bool is_stopped ();
+               public bool is_closed ();
                public virtual weak GLib.FileInfo next_file (GLib.Cancellable cancellable) throws GLib.Error;
-               public virtual void next_files_async (int num_files, int io_priority, GLib.AsyncNextFilesCallback callback, pointer user_data, GLib.Cancellable cancellable);
+               public virtual void next_files_async (int num_files, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public virtual weak GLib.List next_files_finish (GLib.AsyncResult res) throws GLib.Error;
                public void set_pending (bool pending);
-               public virtual bool stop (GLib.Cancellable cancellable) throws GLib.Error;
-               public virtual void stop_async (int io_priority, GLib.AsyncStopEnumeratingCallback callback, pointer user_data, GLib.Cancellable cancellable);
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class FileIcon : GLib.Object, GLib.Icon, GLib.LoadableIcon {
@@ -170,11 +253,15 @@ namespace GLib {
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class FileInfo : GLib.Object {
-               public weak GLib.FileInfo copy ();
-               public weak string get_attribute_as_string (string attribute);
+               public void clear_status ();
+               public void copy_into (GLib.FileInfo dest);
+               public weak GLib.FileInfo dup ();
+               public weak GLib.FileAttributeValue get_attribute (string attribute);
+               public bool get_attribute_boolean (string attribute);
                public weak string get_attribute_byte_string (string attribute);
                public int get_attribute_int32 (string attribute);
                public int64 get_attribute_int64 (string attribute);
+               public weak GLib.Object get_attribute_object (string attribute);
                public weak string get_attribute_string (string attribute);
                public GLib.FileAttributeType get_attribute_type (string attribute);
                public uint get_attribute_uint32 (string attribute);
@@ -182,21 +269,28 @@ namespace GLib {
                public weak string get_content_type ();
                public weak string get_display_name ();
                public weak string get_edit_name ();
+               public weak string get_etag ();
                public GLib.FileType get_file_type ();
-               public GLib.FileFlags get_flags ();
-               public weak string get_icon ();
+               public weak GLib.Icon get_icon ();
+               public bool get_is_hidden ();
+               public bool get_is_symlink ();
                public void get_modification_time (out GLib.TimeVal result);
                public weak string get_name ();
                public int64 get_size ();
+               public int get_sort_order ();
                public weak string get_symlink_target ();
                public static GLib.Type get_type ();
                public bool has_attribute (string attribute);
                public weak string list_attributes (string name_space);
                public FileInfo ();
                public void remove_attribute (string attribute);
+               public void set_attribute (string attribute, GLib.FileAttributeValue value);
+               public void set_attribute_boolean (string attribute, bool value);
                public void set_attribute_byte_string (string attribute, string value);
                public void set_attribute_int32 (string attribute, int value);
                public void set_attribute_int64 (string attribute, int64 value);
+               public void set_attribute_mask (GLib.FileAttributeMatcher mask);
+               public void set_attribute_object (string attribute, GLib.Object value);
                public void set_attribute_string (string attribute, string value);
                public void set_attribute_uint32 (string attribute, uint value);
                public void set_attribute_uint64 (string attribute, uint64 value);
@@ -204,36 +298,44 @@ namespace GLib {
                public void set_display_name (string display_name);
                public void set_edit_name (string edit_name);
                public void set_file_type (GLib.FileType type);
-               public void set_flags (GLib.FileFlags flags);
-               public void set_icon (string icon);
+               public void set_icon (GLib.Icon icon);
+               public void set_is_hidden (bool is_hidden);
+               public void set_is_symlink (bool is_symlink);
                public void set_modification_time (out GLib.TimeVal mtime);
                public void set_name (string name);
                public void set_size (int64 size);
+               public void set_sort_order (int sort_order);
                public void set_symlink_target (string symlink_target);
+               public void unset_attribute_mask ();
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class FileInputStream : GLib.InputStream, GLib.Seekable {
+               public virtual bool can_seek ();
                public virtual weak GLib.FileInfo get_file_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
                public static GLib.Type get_type ();
+               public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable cancellable) throws GLib.Error;
+               public virtual int64 tell ();
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class FileMonitor : GLib.Object {
                public virtual bool cancel ();
-               public static weak GLib.DirectoryMonitor directory (GLib.File file);
-               public void emit_event (GLib.File file, GLib.File other_file, GLib.FileMonitorEvent event_type);
-               public static weak GLib.FileMonitor file (GLib.File file);
+               public static weak GLib.DirectoryMonitor directory (GLib.File file, GLib.FileMonitorFlags flags);
+               public static weak GLib.FileMonitor file (GLib.File file, GLib.FileMonitorFlags flags);
                public static GLib.Type get_type ();
+               public bool is_cancelled ();
                public void set_rate_limit (int limit_msecs);
                public signal void changed (GLib.File file, GLib.File other_file, GLib.FileMonitorEvent event_type);
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
-       public class FileOutputStream : GLib.OutputStream {
+       public class FileOutputStream : GLib.OutputStream, GLib.Seekable {
+               public virtual bool can_seek ();
+               public virtual bool can_truncate ();
+               public virtual weak string get_etag (GLib.Cancellable cancellable) throws GLib.Error;
                public virtual weak GLib.FileInfo get_file_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
-               public void get_final_mtime (out GLib.TimeVal mtime);
-               public bool get_should_get_final_mtime ();
                public static GLib.Type get_type ();
-               public void set_final_mtime (out GLib.TimeVal final_mtime);
-               public void set_should_get_final_mtime (bool get_final_mtime);
+               public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable cancellable) throws GLib.Error;
+               public virtual int64 tell ();
+               public virtual bool truncate (int64 size, GLib.Cancellable cancellable) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class FilterInputStream : GLib.InputStream {
@@ -269,14 +371,11 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class LocalDirectoryMonitor : GLib.DirectoryMonitor {
                public static GLib.Type get_type ();
-               public static weak GLib.DirectoryMonitor start (string dirname);
+               public LocalDirectoryMonitor (string dirname, GLib.FileMonitorFlags flags);
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class LocalFile : GLib.Object, GLib.File {
                public static GLib.Type get_type ();
-               public static weak GLib.FileInfo info_get (string basename, string path, GLib.FileAttributeMatcher attribute_matcher, GLib.FileGetInfoFlags flags, GLib.LocalParentFileInfo parent_info) throws GLib.Error;
-               public static weak GLib.FileInfo info_get_from_fd (int fd, string attributes) throws GLib.Error;
-               public static void info_get_parent_info (string dir, GLib.FileAttributeMatcher attribute_matcher, GLib.LocalParentFileInfo parent_info);
                public LocalFile (string filename);
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
@@ -292,27 +391,28 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class LocalFileMonitor : GLib.FileMonitor {
                public static GLib.Type get_type ();
-               public static weak GLib.FileMonitor start (string dirname);
+               public LocalFileMonitor (string dirname, GLib.FileMonitorFlags flags);
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class LocalFileOutputStream : GLib.FileOutputStream {
                public static weak GLib.FileOutputStream append (string filename, GLib.Cancellable cancellable) throws GLib.Error;
                public static weak GLib.FileOutputStream create (string filename, GLib.Cancellable cancellable) throws GLib.Error;
                public static GLib.Type get_type ();
-               public static weak GLib.FileOutputStream replace (string filename, ulong mtime, bool make_backup, GLib.Cancellable cancellable) throws GLib.Error;
+               public static weak GLib.FileOutputStream replace (string filename, string etag, bool make_backup, GLib.Cancellable cancellable) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
-       public class LocalVfs : GLib.Object, GLib.Vfs {
+       public class LocalVfs : GLib.Vfs {
                public static GLib.Type get_type ();
                public LocalVfs ();
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class MemoryInputStream : GLib.InputStream, GLib.Seekable {
-               public static weak GLib.InputStream from_data (pointer data, ulong len);
+               public static weak GLib.InputStream from_data (pointer data, long len);
                public static GLib.Type get_type ();
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
+               public weak GLib.ByteArray get_data ();
                public static GLib.Type get_type ();
                public MemoryOutputStream (GLib.ByteArray data);
                public void set_max_size (uint max_size);
@@ -362,6 +462,11 @@ namespace GLib {
                public virtual long write_finish (GLib.AsyncResult result) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
+       public class PollFileMonitor : GLib.FileMonitor {
+               public static GLib.Type get_type ();
+               public PollFileMonitor (GLib.File file);
+       }
+       [CCode (cheader_filename = "gio/gvfs.h")]
        public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
                public void complete ();
                public void complete_in_idle ();
@@ -399,7 +504,7 @@ namespace GLib {
                public static GLib.Type get_type ();
                public ThemedIcon (string iconname);
                [NoArrayLength]
-               public ThemedIcon.from_names (string[] iconnames);
+               public ThemedIcon.from_names (string[] iconnames, int len);
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public class UnionDrive : GLib.Object, GLib.Drive {
@@ -448,7 +553,19 @@ namespace GLib {
                public UnixVolumeMonitor ();
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
+       public class Vfs : GLib.Object {
+               public static weak GLib.Vfs get_default ();
+               public virtual weak GLib.File get_file_for_path (string path);
+               public virtual weak GLib.File get_file_for_uri (string uri);
+               public static weak GLib.Vfs get_local ();
+               public weak string get_name ();
+               public virtual int get_priority ();
+               public static GLib.Type get_type ();
+               public virtual weak GLib.File parse_name (string parse_name);
+       }
+       [CCode (cheader_filename = "gio/gvfs.h")]
        public class VolumeMonitor : GLib.Object {
+               public static weak GLib.VolumeMonitor get ();
                public virtual weak GLib.List get_connected_drives ();
                public virtual weak GLib.List get_mounted_volumes ();
                public static GLib.Type get_type ();
@@ -469,6 +586,21 @@ namespace GLib {
                public pointer user_data;
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
+       public class FileAttributeInfo {
+               public weak string name;
+               public GLib.FileAttributeType type;
+               public GLib.FileAttributeFlags flags;
+       }
+       [CCode (ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref", cheader_filename = "gio/gvfs.h")]
+       public class FileAttributeInfoList {
+               public weak GLib.FileAttributeInfo infos;
+               public int n_infos;
+               public void add (string name, GLib.FileAttributeType type, GLib.FileAttributeFlags flags);
+               public weak GLib.FileAttributeInfoList dup ();
+               public weak GLib.FileAttributeInfo lookup (string name);
+               public FileAttributeInfoList ();
+       }
+       [CCode (ref_function = "g_file_attribute_matcher_ref", unref_function = "g_file_attribute_matcher_unref", cheader_filename = "gio/gvfs.h")]
        public class FileAttributeMatcher {
                public bool enumerate_namespace (string @namespace);
                public weak string enumerate_next ();
@@ -477,6 +609,40 @@ namespace GLib {
                public FileAttributeMatcher (string attributes);
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
+       public class FileAttributeValue {
+               public GLib.FileAttributeType type;
+               public GLib.FileAttributeStatus status;
+               public bool boolean;
+               public int int32;
+               public uint uint32;
+               public int64 int64;
+               public uint64 uint64;
+               public weak string string;
+               public GLib.Quark quark;
+               public weak GLib.Object obj;
+               public weak string as_string ();
+               public void clear ();
+               public weak GLib.FileAttributeValue dup ();
+               public bool get_boolean ();
+               public weak string get_byte_string ();
+               public int get_int32 ();
+               public int64 get_int64 ();
+               public weak GLib.Object get_object ();
+               public weak string get_string ();
+               public uint get_uint32 ();
+               public uint64 get_uint64 ();
+               public FileAttributeValue ();
+               public void set (GLib.FileAttributeValue new_value);
+               public void set_boolean (bool value);
+               public void set_byte_string (string value);
+               public void set_int32 (int value);
+               public void set_int64 (int64 value);
+               public void set_object (GLib.Object obj);
+               public void set_string (string value);
+               public void set_uint32 (uint value);
+               public void set_uint64 (uint64 value);
+       }
+       [CCode (cheader_filename = "gio/gvfs.h")]
        public class IOJob {
                public void send_to_mainloop (GLib.IODataFunc func, pointer user_data, GLib.DestroyNotify notify, bool block);
        }
@@ -508,8 +674,11 @@ namespace GLib {
                public static weak GLib.AppInfo create_from_commandline (string commandline, string application_name) throws GLib.Error;
                public abstract weak GLib.AppInfo dup ();
                public abstract bool equal (GLib.AppInfo appinfo2);
+               public static weak GLib.List get_all ();
+               public static weak GLib.List get_all_for_type (string content_type);
+               public static weak GLib.AppInfo get_default_for_type (string content_type);
                public abstract weak string get_description ();
-               public abstract weak string get_icon ();
+               public abstract weak GLib.Icon get_icon ();
                public abstract weak string get_name ();
                public static GLib.Type get_type ();
                [NoArrayLength]
@@ -533,9 +702,8 @@ namespace GLib {
                public abstract bool can_mount ();
                public abstract void eject (GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool eject_finish (GLib.AsyncResult result) throws GLib.Error;
-               public abstract weak string get_icon ();
+               public abstract weak GLib.Icon get_icon ();
                public abstract weak string get_name ();
-               public weak string get_platform_id ();
                public static GLib.Type get_type ();
                public abstract weak GLib.List get_volumes ();
                public abstract bool is_automounted ();
@@ -546,8 +714,12 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gfile.h")]
        public interface File {
                public abstract weak GLib.FileOutputStream append_to (GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract void append_to_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract weak GLib.FileOutputStream append_to_finish (GLib.AsyncResult res) throws GLib.Error;
                public abstract bool copy (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, pointer progress_callback_data) throws GLib.Error;
                public abstract weak GLib.FileOutputStream create (GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract void create_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract weak GLib.FileOutputStream create_finish (GLib.AsyncResult res) throws GLib.Error;
                public bool delete (GLib.Cancellable cancellable) throws GLib.Error;
                public abstract weak GLib.File dup ();
                public abstract void eject_mountable (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -557,13 +729,10 @@ namespace GLib {
                public abstract weak string get_basename ();
                public weak GLib.File get_child (string name);
                public abstract weak GLib.File get_child_for_display_name (string display_name) throws GLib.Error;
-               public void get_contents_async (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-               public bool get_contents_finish (GLib.AsyncResult res, string contents, ulong length) throws GLib.Error;
                public abstract weak GLib.FileInfo get_filesystem_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
-               public static weak GLib.File get_for_commandline_arg (string arg);
-               public static weak GLib.File get_for_path (string path);
-               public static weak GLib.File get_for_uri (string uri);
                public abstract weak GLib.FileInfo get_info (string attributes, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract void get_info_async (string attributes, GLib.FileGetInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract weak GLib.FileInfo get_info_finish (GLib.AsyncResult res) throws GLib.Error;
                public abstract weak GLib.File get_parent ();
                public abstract weak string get_parse_name ();
                public abstract weak string get_path ();
@@ -571,24 +740,38 @@ namespace GLib {
                public abstract weak string get_uri ();
                public static uint hash (pointer file);
                public abstract bool is_native ();
+               public bool load_contents (GLib.Cancellable cancellable, out string contents, ulong length) throws GLib.Error;
+               public void load_contents_async (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public bool load_contents_finish (GLib.AsyncResult res, out string contents, ulong length) throws GLib.Error;
                public abstract bool make_directory (GLib.Cancellable cancellable) throws GLib.Error;
                public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void mount_mountable (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract weak GLib.File mount_mountable_finish (GLib.AsyncResult result) throws GLib.Error;
                public abstract bool move (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, pointer progress_callback_data) throws GLib.Error;
+               public static weak GLib.File new_for_commandline_arg (string arg);
+               public static weak GLib.File new_for_path (string path);
+               public static weak GLib.File new_for_uri (string uri);
                public static weak GLib.File parse_name (string parse_name);
+               public abstract weak GLib.FileAttributeInfoList query_settable_attributes (GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract weak GLib.FileAttributeInfoList query_writable_namespaces (GLib.Cancellable cancellable) throws GLib.Error;
                public abstract weak GLib.FileInputStream read (GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void read_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract weak GLib.FileInputStream read_finish (GLib.AsyncResult res) throws GLib.Error;
-               public abstract weak GLib.FileOutputStream replace (ulong mtime, bool make_backup, GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract weak GLib.FileOutputStream replace (string etag, bool make_backup, GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract void replace_async (string etag, bool make_backup, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public bool replace_contents (string contents, ulong length, string etag, bool make_backup, GLib.Cancellable cancellable) throws GLib.Error;
+               public void replace_contents_async (string contents, ulong length, string etag, bool make_backup, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public bool replace_contents_finish (GLib.AsyncResult res) throws GLib.Error;
+               public abstract weak GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error;
                public abstract weak GLib.File resolve_relative (string relative_path);
-               public abstract bool set_attribute (string attribute, GLib.FileAttributeType type, pointer value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract bool set_attribute (string attribute, GLib.FileAttributeValue value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public bool set_attribute_byte_string (string attribute, string value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
-               public bool set_attribute_int32 (string attribute, string value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+               public bool set_attribute_int32 (string attribute, int value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public bool set_attribute_int64 (string attribute, int64 value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public bool set_attribute_string (string attribute, string value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public bool set_attribute_uint32 (string attribute, uint value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract bool set_attributes_from_info (GLib.FileInfo info, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract weak GLib.File set_display_name (string display_name, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract bool trash (GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void unmount_mountable (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -617,32 +800,21 @@ namespace GLib {
                public abstract bool truncate (int64 offset, GLib.Cancellable cancellable) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
-       public interface Vfs {
-               public static weak GLib.Vfs get ();
-               public abstract weak GLib.File get_file_for_path (string path);
-               public abstract weak GLib.File get_file_for_uri (string uri);
-               public static GLib.Type get_type ();
-               public abstract weak GLib.File parse_name (string parse_name);
-       }
-       [CCode (cheader_filename = "gio/gvfs.h")]
        public interface Volume {
                public abstract bool can_eject ();
                public abstract bool can_unmount ();
                public abstract void eject (GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool eject_finish (GLib.AsyncResult result) throws GLib.Error;
                public abstract weak GLib.Drive get_drive ();
-               public abstract weak string get_icon ();
+               public abstract weak GLib.Icon get_icon ();
                public abstract weak string get_name ();
-               public abstract weak string get_platform_id ();
                public abstract weak GLib.File get_root ();
                public static GLib.Type get_type ();
                public abstract void unmount (GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool unmount_finish (GLib.AsyncResult result) throws GLib.Error;
                public signal void changed ();
        }
-       public static delegate void AsyncNextFilesCallback (GLib.FileEnumerator enumerator, GLib.List files, int num_files, pointer user_data, GLib.Error error);
        public static delegate void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res, pointer user_data);
-       public static delegate void AsyncStopEnumeratingCallback (GLib.FileEnumerator enumerator, bool result, pointer user_data, GLib.Error error);
        public static delegate bool FDSourceFunc (pointer user_data, GLib.IOCondition condition, int fd);
        public static delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes, pointer user_data);
        public static delegate void IODataFunc (pointer user_data);

diff --git a/vapi/packages/gio-standalone/gio-standalone.gidl b/vapi/packages/gio-standalone/gio-standalone.gidl
index ba6a8d9..4c6e631 100644 (file)
--- a/vapi/packages/gio-standalone/gio-standalone.gidl
+++ b/vapi/packages/gio-standalone/gio-standalone.gidl
@@ -7,44 +7,62 @@
 
 -->
   <namespace name="GLib">
-    <enum name="GDirectoryMonitorEvent" type="enum" type-name="GDirectoryMonitorEvent">
-      <member name="G_DIRECTORY_MONITOR_EVENT_CHANGED" value=""/>
-      <member name="G_DIRECTORY_MONITOR_EVENT_DELETED" value=""/>
-      <member name="G_DIRECTORY_MONITOR_EVENT_CREATED" value=""/>
-      <member name="G_DIRECTORY_MONITOR_EVENT_ATTRIBUTE_CHANGED" value=""/>
-      <member name="G_DIRECTORY_MONITOR_EVENT_UNMOUNTED" value=""/>
+    <enum name="GDataStreamByteOrder" type-name="GDataStreamByteOrder" type="enum">
+      <member name="G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN" value=""/>
+      <member name="G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN" value=""/>
+      <member name="G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN" value=""/>
     </enum>
-    <enum name="GFileAttributeType" type="enum" type-name="GFileAttributeType">
-      <member name="G_FILE_ATTRIBUTE_TYPE_INVALID" value="0"/>
+    <enum name="GDataStreamNewlineType" type-name="GDataStreamNewlineType" type="enum">
+      <member name="G_DATA_STREAM_NEWLINE_TYPE_LF" value=""/>
+      <member name="G_DATA_STREAM_NEWLINE_TYPE_CR" value=""/>
+      <member name="G_DATA_STREAM_NEWLINE_TYPE_CR_LF" value=""/>
+      <member name="G_DATA_STREAM_NEWLINE_TYPE_ANY" value=""/>
+    </enum>
+    <enum name="GFileAttributeFlags" type-name="GFileAttributeFlags" type="flags">
+      <member name="G_FILE_ATTRIBUTE_FLAGS_NONE" value=""/>
+      <member name="G_FILE_ATTRIBUTE_FLAGS_COPY_WITH_FILE" value=""/>
+      <member name="G_FILE_ATTRIBUTE_FLAGS_COPY_WHEN_MOVED" value=""/>
+    </enum>
+    <enum name="GFileAttributeStatus" type-name="GFileAttributeStatus" type="enum">
+      <member name="G_FILE_ATTRIBUTE_STATUS_UNSET" value=""/>
+      <member name="G_FILE_ATTRIBUTE_STATUS_SET" value=""/>
+      <member name="G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING" value=""/>
+    </enum>
+    <enum name="GFileAttributeType" type-name="GFileAttributeType" type="enum">
+      <member name="G_FILE_ATTRIBUTE_TYPE_INVALID" value=""/>
       <member name="G_FILE_ATTRIBUTE_TYPE_STRING" value=""/>
       <member name="G_FILE_ATTRIBUTE_TYPE_BYTE_STRING" value=""/>
+      <member name="G_FILE_ATTRIBUTE_TYPE_BOOLEAN" value=""/>
       <member name="G_FILE_ATTRIBUTE_TYPE_UINT32" value=""/>
       <member name="G_FILE_ATTRIBUTE_TYPE_INT32" value=""/>
       <member name="G_FILE_ATTRIBUTE_TYPE_UINT64" value=""/>
       <member name="G_FILE_ATTRIBUTE_TYPE_INT64" value=""/>
+      <member name="G_FILE_ATTRIBUTE_TYPE_OBJECT" value=""/>
     </enum>
-    <enum name="GFileCopyFlags" type="flags" type-name="GFileCopyFlags">
+    <enum name="GFileCopyFlags" type-name="GFileCopyFlags" type="flags">
       <member name="G_FILE_COPY_OVERWRITE" value=""/>
       <member name="G_FILE_COPY_BACKUP" value=""/>
+      <member name="G_FILE_COPY_NOFOLLOW_SYMLINKS" value=""/>
+      <member name="G_FILE_COPY_ALL_METADATA" value=""/>
     </enum>
-    <enum name="GFileFlags" type="flags" type-name="GFileFlags">
-      <member name="G_FILE_FLAG_HIDDEN" value=""/>
-      <member name="G_FILE_FLAG_SYMLINK" value=""/>
-      <member name="G_FILE_FLAG_LOCAL" value=""/>
-      <member name="G_FILE_FLAG_VIRTUAL" value=""/>
-    </enum>
-    <enum name="GFileGetInfoFlags" type="flags" type-name="GFileGetInfoFlags">
-      <member name="G_FILE_GET_INFO_NOFOLLOW_SYMLINKS" value=""/>
+    <enum name="GFileGetInfoFlags" type-name="GFileGetInfoFlags" type="flags">
+      <member name="G_FILE_GET_INFO_NOFOLLOW_SYMLINKS" value="(1&lt;&lt;0)"/>
     </enum>
-    <enum name="GFileMonitorEvent" type="enum" type-name="GFileMonitorEvent">
+    <enum name="GFileMonitorEvent" type-name="GFileMonitorEvent" type="enum">
       <member name="G_FILE_MONITOR_EVENT_CHANGED" value=""/>
+      <member name="G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT" value=""/>
       <member name="G_FILE_MONITOR_EVENT_DELETED" value=""/>
       <member name="G_FILE_MONITOR_EVENT_CREATED" value=""/>
       <member name="G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED" value=""/>
+      <member name="G_FILE_MONITOR_EVENT_PRE_UNMOUNT" value=""/>
       <member name="G_FILE_MONITOR_EVENT_UNMOUNTED" value=""/>
     </enum>
-    <enum name="GFileType" type="enum" type-name="GFileType">
-      <member name="G_FILE_TYPE_UNKNOWN" value="0"/>
+    <enum name="GFileMonitorFlags" type-name="GFileMonitorFlags" type="flags">
+      <member name="G_FILE_MONITOR_FLAGS_NONE" value=""/>
+      <member name="G_FILE_MONITOR_FLAGS_MONITOR_MOUNTS" value=""/>
+    </enum>
+    <enum name="GFileType" type-name="GFileType" type="enum">
+      <member name="G_FILE_TYPE_UNKNOWN" value=""/>
       <member name="G_FILE_TYPE_REGULAR" value=""/>
       <member name="G_FILE_TYPE_DIRECTORY" value=""/>
       <member name="G_FILE_TYPE_SYMBOLIC_LINK" value=""/>
@@ -52,7 +70,7 @@
       <member name="G_FILE_TYPE_SHORTCUT" value=""/>
       <member name="G_FILE_TYPE_MOUNTABLE" value=""/>
     </enum>
-    <enum name="GIOErrorEnum" type="enum" type-name="GIOErrorEnum">
+    <enum name="GIOErrorEnum" type-name="GIOErrorEnum" type="enum">
       <member name="G_IO_ERROR_FAILED" value=""/>
       <member name="G_IO_ERROR_NOT_FOUND" value=""/>
       <member name="G_IO_ERROR_EXISTS" value=""/>
@@ -76,22 +94,25 @@
       <member name="G_IO_ERROR_PENDING" value=""/>
       <member name="G_IO_ERROR_READ_ONLY" value=""/>
       <member name="G_IO_ERROR_CANT_CREATE_BACKUP" value=""/>
-      <member name="G_IO_ERROR_WRONG_MTIME" value=""/>
+      <member name="G_IO_ERROR_WRONG_ETAG" value=""/>
       <member name="G_IO_ERROR_TIMED_OUT" value=""/>
+      <member name="G_IO_ERROR_WOULD_RECURSE" value=""/>
+      <member name="G_IO_ERROR_BUSY" value=""/>
+      <member name="G_IO_ERROR_WOULD_BLOCK" value=""/>
     </enum>
-    <enum name="GPasswordFlags" type="flags" type-name="GPasswordFlags">
+    <enum name="GPasswordFlags" type-name="GPasswordFlags" type="flags">
       <member name="G_PASSWORD_FLAGS_NEED_PASSWORD" value=""/>
       <member name="G_PASSWORD_FLAGS_NEED_USERNAME" value=""/>
       <member name="G_PASSWORD_FLAGS_NEED_DOMAIN" value=""/>
       <member name="G_PASSWORD_FLAGS_SAVING_SUPPORTED" value=""/>
       <member name="G_PASSWORD_FLAGS_ANON_SUPPORTED" value=""/>
     </enum>
-    <enum name="GPasswordSave" type="enum" type-name="GPasswordSave">
+    <enum name="GPasswordSave" type-name="GPasswordSave" type="enum">
       <member name="G_PASSWORD_SAVE_NEVER" value=""/>
       <member name="G_PASSWORD_SAVE_FOR_SESSION" value=""/>
       <member name="G_PASSWORD_SAVE_PERMANENTLY" value=""/>
     </enum>
-    <enum name="GUnixMountType" type="enum" type-name="GUnixMountType">
+    <enum name="GUnixMountType" type-name="GUnixMountType" type="enum">
       <member name="G_UNIX_MOUNT_TYPE_UNKNOWN" value=""/>
       <member name="G_UNIX_MOUNT_TYPE_FLOPPY" value=""/>
       <member name="G_UNIX_MOUNT_TYPE_CDROM" value=""/>
@@ -106,191 +127,187 @@
       <member name="G_UNIX_MOUNT_TYPE_CAMERA" value=""/>
       <member name="G_UNIX_MOUNT_TYPE_HD" value=""/>
     </enum>
-    <callback name="GAsyncNextFilesCallback" type-name="GAsyncNextFilesCallback">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="enumerator" type="GFileEnumerator*"/>
-        <parameter name="files" type="GList*"/>
-        <parameter name="num_files" type="int"/>
-        <parameter name="user_data" type="gpointer"/>
-        <parameter name="error" type="GError*"/>
-      </parameters>
-    </callback>
     <callback name="GAsyncReadyCallback" type-name="GAsyncReadyCallback">
       <return-type type="void"/>
       <parameters>
-        <parameter name="source_object" type="GObject*"/>
-        <parameter name="res" type="GAsyncResult*"/>
-        <parameter name="user_data" type="gpointer"/>
-      </parameters>
-    </callback>
-    <callback name="GAsyncStopEnumeratingCallback" type-name="GAsyncStopEnumeratingCallback">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="enumerator" type="GFileEnumerator*"/>
-        <parameter name="result" type="gboolean"/>
-        <parameter name="user_data" type="gpointer"/>
-        <parameter name="error" type="GError*"/>
+        <parameter type="GObject*" name="source_object"/>
+        <parameter type="GAsyncResult*" name="res"/>
+        <parameter type="gpointer" name="user_data"/>
       </parameters>
     </callback>
     <callback name="GFDSourceFunc" type-name="GFDSourceFunc">
       <return-type type="gboolean"/>
       <parameters>
-        <parameter name="user_data" type="gpointer"/>
-        <parameter name="condition" type="GIOCondition"/>
-        <parameter name="fd" type="int"/>
+        <parameter type="gpointer" name="user_data"/>
+        <parameter type="GIOCondition" name="condition"/>
+        <parameter type="int" name="fd"/>
       </parameters>
     </callback>
     <callback name="GFileProgressCallback" type-name="GFileProgressCallback">
       <return-type type="void"/>
       <parameters>
-        <parameter name="current_num_bytes" type="goffset"/>
-        <parameter name="total_num_bytes" type="goffset"/>
-        <parameter name="user_data" type="gpointer"/>
+        <parameter type="goffset" name="current_num_bytes"/>
+        <parameter type="goffset" name="total_num_bytes"/>
+        <parameter type="gpointer" name="user_data"/>
       </parameters>
     </callback>
     <callback name="GIODataFunc" type-name="GIODataFunc">
       <return-type type="void"/>
       <parameters>
-        <parameter name="user_data" type="gpointer"/>
+        <parameter type="gpointer" name="user_data"/>
       </parameters>
     </callback>
     <callback name="GIOJobFunc" type-name="GIOJobFunc">
       <return-type type="void"/>
       <parameters>
-        <parameter name="job" type="GIOJob*"/>
-        <parameter name="cancellable" type="GCancellable*"/>
-        <parameter name="user_data" type="gpointer"/>
+        <parameter type="GIOJob*" name="job"/>
+        <parameter type="GCancellable*" name="cancellable"/>
+        <parameter type="gpointer" name="user_data"/>
       </parameters>
     </callback>
     <callback name="GSimpleAsyncThreadFunc" type-name="GSimpleAsyncThreadFunc">
       <return-type type="void"/>
       <parameters>
-        <parameter name="res" type="GSimpleAsyncResult*"/>
-        <parameter name="object" type="GObject*"/>
-        <parameter name="cancellable" type="GCancellable*"/>
+        <parameter type="GSimpleAsyncResult*" name="res"/>
+        <parameter type="GObject*" name="object"/>
+        <parameter type="GCancellable*" name="cancellable"/>
       </parameters>
     </callback>
     <callback name="GUnixMountCallback" type-name="GUnixMountCallback">
       <return-type type="void"/>
       <parameters>
-        <parameter name="user_data" type="gpointer"/>
+        <parameter type="gpointer" name="user_data"/>
       </parameters>
     </callback>
-    <interface get-type="" name="GAppInfo" type-name="GAppInfo">
+    <interface name="GAppInfo" type-name="GAppInfo" get-type="">
       <vfunc name="dup">
         <return-type type="GAppInfo*"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </vfunc>
       <vfunc name="equal">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo1" type="GAppInfo*"/>
-          <parameter name="appinfo2" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo1"/>
+          <parameter type="GAppInfo*" name="appinfo2"/>
         </parameters>
       </vfunc>
       <vfunc name="get_name">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </vfunc>
       <vfunc name="get_description">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </vfunc>
       <vfunc name="get_icon">
-        <return-type type="char*"/>
+        <return-type type="GIcon*"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </vfunc>
       <vfunc name="launch">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
-          <parameter name="filenames" type="GList*"/>
-          <parameter name="envp" type="char**"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="GList*" name="filenames"/>
+          <parameter type="char**" name="envp"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="supports_uris">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </vfunc>
       <vfunc name="launch_uris">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
-          <parameter name="uris" type="GList*"/>
-          <parameter name="envp" type="char**"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="GList*" name="uris"/>
+          <parameter type="char**" name="envp"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="should_show">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
-          <parameter name="desktop_env" type="const-char*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="const-char*" name="desktop_env"/>
         </parameters>
       </vfunc>
       <vfunc name="supports_xdg_startup_notify">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </vfunc>
       <vfunc name="set_as_default_for_type">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
-          <parameter name="content_type" type="const-char*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="const-char*" name="content_type"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <method name="create_from_commandline" symbol="g_app_info_create_from_commandline">
         <return-type type="GAppInfo*"/>
         <parameters>
-          <parameter name="commandline" type="const-char*"/>
-          <parameter name="application_name" type="const-char*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="const-char*" name="commandline"/>
+          <parameter type="const-char*" name="application_name"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="dup" symbol="g_app_info_dup">
         <return-type type="GAppInfo*"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </method>
       <method name="equal" symbol="g_app_info_equal">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo1" type="GAppInfo*"/>
-          <parameter name="appinfo2" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo1"/>
+          <parameter type="GAppInfo*" name="appinfo2"/>
+        </parameters>
+      </method>
+      <method name="get_all" symbol="g_app_info_get_all">
+        <return-type type="GList*"/>
+      </method>
+      <method name="get_all_for_type" symbol="g_app_info_get_all_for_type">
+        <return-type type="GList*"/>
+        <parameters>
+          <parameter type="const-char*" name="content_type"/>
+        </parameters>
+      </method>
+      <method name="get_default_for_type" symbol="g_app_info_get_default_for_type">
+        <return-type type="GAppInfo*"/>
+        <parameters>
+          <parameter type="const-char*" name="content_type"/>
         </parameters>
       </method>
       <method name="get_description" symbol="g_app_info_get_description">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </method>
       <method name="get_icon" symbol="g_app_info_get_icon">
-        <return-type type="char*"/>
+        <return-type type="GIcon*"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </method>
       <method name="get_name" symbol="g_app_info_get_name">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_app_info_get_type">
@@ -299,66 +316,66 @@
       <method name="launch" symbol="g_app_info_launch">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
-          <parameter name="filenames" type="GList*"/>
-          <parameter name="envp" type="char**"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="GList*" name="filenames"/>
+          <parameter type="char**" name="envp"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="launch_uris" symbol="g_app_info_launch_uris">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
-          <parameter name="uris" type="GList*"/>
-          <parameter name="envp" type="char**"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="GList*" name="uris"/>
+          <parameter type="char**" name="envp"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="set_as_default_for_type" symbol="g_app_info_set_as_default_for_type">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
-          <parameter name="content_type" type="const-char*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="const-char*" name="content_type"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="should_show" symbol="g_app_info_should_show">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
-          <parameter name="desktop_env" type="const-char*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="const-char*" name="desktop_env"/>
         </parameters>
       </method>
       <method name="supports_uris" symbol="g_app_info_supports_uris">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </method>
       <method name="supports_xdg_startup_notify" symbol="g_app_info_supports_xdg_startup_notify">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="appinfo" type="GAppInfo*"/>
+          <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </method>
     </interface>
-    <interface get-type="" name="GAsyncResult" type-name="GAsyncResult">
+    <interface name="GAsyncResult" type-name="GAsyncResult" get-type="">
       <vfunc name="get_user_data">
         <return-type type="gpointer"/>
         <parameters>
-          <parameter name="async_result" type="GAsyncResult*"/>
+          <parameter type="GAsyncResult*" name="async_result"/>
         </parameters>
       </vfunc>
       <vfunc name="get_source_object">
         <return-type type="GObject*"/>
         <parameters>
-          <parameter name="async_result" type="GAsyncResult*"/>
+          <parameter type="GAsyncResult*" name="async_result"/>
         </parameters>
       </vfunc>
       <method name="get_source_object" symbol="g_async_result_get_source_object">
         <return-type type="GObject*"/>
         <parameters>
-          <parameter name="res" type="GAsyncResult*"/>
+          <parameter type="GAsyncResult*" name="res"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_async_result_get_type">
@@ -367,130 +384,124 @@
       <method name="get_user_data" symbol="g_async_result_get_user_data">
         <return-type type="gpointer"/>
         <parameters>
-          <parameter name="res" type="GAsyncResult*"/>
+          <parameter type="GAsyncResult*" name="res"/>
         </parameters>
       </method>
     </interface>
-    <interface get-type="" name="GDrive" type-name="GDrive">
+    <interface name="GDrive" type-name="GDrive" get-type="">
       <signal name="changed" when="LAST">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </signal>
       <vfunc name="get_name">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </vfunc>
       <vfunc name="get_icon">
-        <return-type type="char*"/>
+        <return-type type="GIcon*"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </vfunc>
       <vfunc name="get_volumes">
         <return-type type="GList*"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </vfunc>
       <vfunc name="is_automounted">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </vfunc>
       <vfunc name="can_mount">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </vfunc>
       <vfunc name="can_eject">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </vfunc>
       <vfunc name="mount">
         <return-type type="void"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
-          <parameter name="mount_operation" type="GMountOperation*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GDrive*" name="drive"/>
+          <parameter type="GMountOperation*" name="mount_operation"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="mount_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GDrive*" name="drive"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="eject">
         <return-type type="void"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GDrive*" name="drive"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="eject_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GDrive*" name="drive"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <method name="can_eject" symbol="g_drive_can_eject">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </method>
       <method name="can_mount" symbol="g_drive_can_mount">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </method>
       <method name="eject" symbol="g_drive_eject">
         <return-type type="void"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GDrive*" name="drive"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="eject_finish" symbol="g_drive_eject_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GDrive*" name="drive"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="get_icon" symbol="g_drive_get_icon">
-        <return-type type="char*"/>
+        <return-type type="GIcon*"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </method>
       <method name="get_name" symbol="g_drive_get_name">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
-        </parameters>
-      </method>
-      <method name="get_platform_id" symbol="g_drive_get_platform_id">
-        <return-type type="char*"/>
-        <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_drive_get_type">
@@ -499,514 +510,636 @@
       <method name="get_volumes" symbol="g_drive_get_volumes">
         <return-type type="GList*"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </method>
       <method name="is_automounted" symbol="g_drive_is_automounted">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </method>
       <method name="mount" symbol="g_drive_mount">
         <return-type type="void"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
-          <parameter name="mount_operation" type="GMountOperation*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GDrive*" name="drive"/>
+          <parameter type="GMountOperation*" name="mount_operation"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="mount_finish" symbol="g_drive_mount_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GDrive*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GDrive*" name="drive"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
     </interface>
-    <interface get-type="" name="GFile" type-name="GFile">
+    <interface name="GFile" type-name="GFile" get-type="">
       <vfunc name="dup">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </vfunc>
       <vfunc name="hash">
         <return-type type="guint"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </vfunc>
       <vfunc name="equal">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file1" type="GFile*"/>
-          <parameter name="file2" type="GFile*"/>
+          <parameter type="GFile*" name="file1"/>
+          <parameter type="GFile*" name="file2"/>
         </parameters>
       </vfunc>
       <vfunc name="is_native">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </vfunc>
       <vfunc name="get_basename">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </vfunc>
       <vfunc name="get_path">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </vfunc>
       <vfunc name="get_uri">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </vfunc>
       <vfunc name="get_parse_name">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </vfunc>
       <vfunc name="get_parent">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </vfunc>
       <vfunc name="resolve_relative">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="relative_path" type="const-char*"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="relative_path"/>
         </parameters>
       </vfunc>
       <vfunc name="get_child_for_display_name">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="display_name" type="const-char*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="display_name"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="enumerate_children">
         <return-type type="GFileEnumerator*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attributes" type="const-char*"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="get_info">
         <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attributes" type="const-char*"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="get_info_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="get_info_finish">
+        <return-type type="GFileInfo*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="get_filesystem_info">
         <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attributes" type="const-char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="set_display_name">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="display_name" type="const-char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="display_name"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="query_settable_attributes">
+        <return-type type="GFileAttributeInfoList*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="query_writable_namespaces">
+        <return-type type="GFileAttributeInfoList*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="set_attribute">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="type" type="GFileAttributeType"/>
-          <parameter name="data" type="gconstpointer"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="const-GFileAttributeValue*" name="value"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="set_attributes_from_info">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="read">
         <return-type type="GFileInputStream*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="append_to">
         <return-type type="GFileOutputStream*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="create">
         <return-type type="GFileOutputStream*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="replace">
         <return-type type="GFileOutputStream*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="mtime" type="time_t"/>
-          <parameter name="make_backup" type="gboolean"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="etag"/>
+          <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="delete_file">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="trash">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="make_directory">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="make_symbolic_link">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="symlink_value" type="const-char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="symlink_value"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="copy">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="source" type="GFile*"/>
-          <parameter name="destination" type="GFile*"/>
-          <parameter name="flags" type="GFileCopyFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="progress_callback" type="GFileProgressCallback"/>
-          <parameter name="progress_callback_data" type="gpointer"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="source"/>
+          <parameter type="GFile*" name="destination"/>
+          <parameter type="GFileCopyFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GFileProgressCallback" name="progress_callback"/>
+          <parameter type="gpointer" name="progress_callback_data"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="move">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="source" type="GFile*"/>
-          <parameter name="destination" type="GFile*"/>
-          <parameter name="flags" type="GFileCopyFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="progress_callback" type="GFileProgressCallback"/>
-          <parameter name="progress_callback_data" type="gpointer"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="source"/>
+          <parameter type="GFile*" name="destination"/>
+          <parameter type="GFileCopyFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GFileProgressCallback" name="progress_callback"/>
+          <parameter type="gpointer" name="progress_callback_data"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="read_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="read_finish">
         <return-type type="GFileInputStream*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="res" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="append_to_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="append_to_finish">
+        <return-type type="GFileOutputStream*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="create_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="create_finish">
+        <return-type type="GFileOutputStream*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="replace_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="etag"/>
+          <parameter type="gboolean" name="make_backup"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="replace_finish">
+        <return-type type="GFileOutputStream*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="mount_mountable">
         <return-type type="void"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="mount_operation" type="GMountOperation*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GMountOperation*" name="mount_operation"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="mount_mountable_finish">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="unmount_mountable">
         <return-type type="void"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="unmount_mountable_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="eject_mountable">
         <return-type type="void"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="eject_mountable_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="mount_for_location">
         <return-type type="void"/>
         <parameters>
-          <parameter name="location" type="GFile*"/>
-          <parameter name="mount_operation" type="GMountOperation*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GFile*" name="location"/>
+          <parameter type="GMountOperation*" name="mount_operation"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="mount_for_location_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="location" type="GFile*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="location"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="monitor_dir">
         <return-type type="GDirectoryMonitor*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GFileMonitorFlags" name="flags"/>
         </parameters>
       </vfunc>
       <vfunc name="monitor_file">
         <return-type type="GFileMonitor*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GFileMonitorFlags" name="flags"/>
         </parameters>
       </vfunc>
       <method name="append_to" symbol="g_file_append_to">
         <return-type type="GFileOutputStream*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="append_to_async" symbol="g_file_append_to_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="append_to_finish" symbol="g_file_append_to_finish">
+        <return-type type="GFileOutputStream*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="copy" symbol="g_file_copy">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="source" type="GFile*"/>
-          <parameter name="destination" type="GFile*"/>
-          <parameter name="flags" type="GFileCopyFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="progress_callback" type="GFileProgressCallback"/>
-          <parameter name="progress_callback_data" type="gpointer"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="source"/>
+          <parameter type="GFile*" name="destination"/>
+          <parameter type="GFileCopyFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GFileProgressCallback" name="progress_callback"/>
+          <parameter type="gpointer" name="progress_callback_data"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="create" symbol="g_file_create">
         <return-type type="GFileOutputStream*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="create_async" symbol="g_file_create_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="create_finish" symbol="g_file_create_finish">
+        <return-type type="GFileOutputStream*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="delete" symbol="g_file_delete">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="dup" symbol="g_file_dup">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </method>
       <method name="eject_mountable" symbol="g_file_eject_mountable">
         <return-type type="void"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="eject_mountable_finish" symbol="g_file_eject_mountable_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="enumerate_children" symbol="g_file_enumerate_children">
         <return-type type="GFileEnumerator*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attributes" type="const-char*"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="equal" symbol="g_file_equal">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file1" type="GFile*"/>
-          <parameter name="file2" type="GFile*"/>
+          <parameter type="GFile*" name="file1"/>
+          <parameter type="GFile*" name="file2"/>
         </parameters>
       </method>
       <method name="get_basename" symbol="g_file_get_basename">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </method>
       <method name="get_child" symbol="g_file_get_child">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="name" type="const-char*"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="name"/>
         </parameters>
       </method>
       <method name="get_child_for_display_name" symbol="g_file_get_child_for_display_name">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="display_name" type="const-char*"/>
-          <parameter name="error" type="GError**"/>
-        </parameters>
-      </method>
-      <method name="get_contents_async" symbol="g_file_get_contents_async">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
-        </parameters>
-      </method>
-      <method name="get_contents_finish" symbol="g_file_get_contents_finish">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="res" type="GAsyncResult*"/>
-          <parameter name="contents" type="gchar**"/>
-          <parameter name="length" type="gsize*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="display_name"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="get_filesystem_info" symbol="g_file_get_filesystem_info">
         <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attributes" type="const-char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
-        </parameters>
-      </method>
-      <method name="get_for_commandline_arg" symbol="g_file_get_for_commandline_arg">
-        <return-type type="GFile*"/>
-        <parameters>
-          <parameter name="arg" type="const-char*"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_for_path" symbol="g_file_get_for_path">
-        <return-type type="GFile*"/>
+      <method name="get_info" symbol="g_file_get_info">
+        <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="path" type="const-char*"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_for_uri" symbol="g_file_get_for_uri">
-        <return-type type="GFile*"/>
+      <method name="get_info_async" symbol="g_file_get_info_async">
+        <return-type type="void"/>
         <parameters>
-          <parameter name="uri" type="const-char*"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
-      <method name="get_info" symbol="g_file_get_info">
+      <method name="get_info_finish" symbol="g_file_get_info_finish">
         <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attributes" type="const-char*"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="get_parent" symbol="g_file_get_parent">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </method>
       <method name="get_parse_name" symbol="g_file_get_parse_name">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </method>
       <method name="get_path" symbol="g_file_get_path">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_file_get_type">
@@ -1015,249 +1148,374 @@
       <method name="get_uri" symbol="g_file_get_uri">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </method>
       <method name="hash" symbol="g_file_hash">
         <return-type type="guint"/>
         <parameters>
-          <parameter name="file" type="gconstpointer"/>
+          <parameter type="gconstpointer" name="file"/>
         </parameters>
       </method>
       <method name="is_native" symbol="g_file_is_native">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
+        </parameters>
+      </method>
+      <method name="load_contents" symbol="g_file_load_contents">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="char**" name="contents"/>
+          <parameter type="gsize*" name="length"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="load_contents_async" symbol="g_file_load_contents_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="load_contents_finish" symbol="g_file_load_contents_finish">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="char**" name="contents"/>
+          <parameter type="gsize*" name="length"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="make_directory" symbol="g_file_make_directory">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="make_symbolic_link" symbol="g_file_make_symbolic_link">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="symlink_value" type="const-char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="symlink_value"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="mount_mountable" symbol="g_file_mount_mountable">
         <return-type type="void"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="mount_operation" type="GMountOperation*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GMountOperation*" name="mount_operation"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="mount_mountable_finish" symbol="g_file_mount_mountable_finish">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="move" symbol="g_file_move">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="source" type="GFile*"/>
-          <parameter name="destination" type="GFile*"/>
-          <parameter name="flags" type="GFileCopyFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="progress_callback" type="GFileProgressCallback"/>
-          <parameter name="progress_callback_data" type="gpointer"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="source"/>
+          <parameter type="GFile*" name="destination"/>
+          <parameter type="GFileCopyFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GFileProgressCallback" name="progress_callback"/>
+          <parameter type="gpointer" name="progress_callback_data"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="new_for_commandline_arg" symbol="g_file_new_for_commandline_arg">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="const-char*" name="arg"/>
+        </parameters>
+      </method>
+      <method name="new_for_path" symbol="g_file_new_for_path">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="const-char*" name="path"/>
+        </parameters>
+      </method>
+      <method name="new_for_uri" symbol="g_file_new_for_uri">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="const-char*" name="uri"/>
         </parameters>
       </method>
       <method name="parse_name" symbol="g_file_parse_name">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="parse_name" type="const-char*"/>
+          <parameter type="const-char*" name="parse_name"/>
+        </parameters>
+      </method>
+      <method name="query_settable_attributes" symbol="g_file_query_settable_attributes">
+        <return-type type="GFileAttributeInfoList*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="query_writable_namespaces" symbol="g_file_query_writable_namespaces">
+        <return-type type="GFileAttributeInfoList*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="read" symbol="g_file_read">
         <return-type type="GFileInputStream*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="read_async" symbol="g_file_read_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="read_finish" symbol="g_file_read_finish">
         <return-type type="GFileInputStream*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="res" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="replace" symbol="g_file_replace">
         <return-type type="GFileOutputStream*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="mtime" type="time_t"/>
-          <parameter name="make_backup" type="gboolean"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="etag"/>
+          <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="replace_async" symbol="g_file_replace_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="etag"/>
+          <parameter type="gboolean" name="make_backup"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="replace_contents" symbol="g_file_replace_contents">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="contents"/>
+          <parameter type="gsize" name="length"/>
+          <parameter type="const-char*" name="etag"/>
+          <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="replace_contents_async" symbol="g_file_replace_contents_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="contents"/>
+          <parameter type="gsize" name="length"/>
+          <parameter type="const-char*" name="etag"/>
+          <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="replace_contents_finish" symbol="g_file_replace_contents_finish">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="replace_finish" symbol="g_file_replace_finish">
+        <return-type type="GFileOutputStream*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="resolve_relative" symbol="g_file_resolve_relative">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="relative_path" type="const-char*"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="relative_path"/>
         </parameters>
       </method>
       <method name="set_attribute" symbol="g_file_set_attribute">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="type" type="GFileAttributeType"/>
-          <parameter name="value" type="gconstpointer"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="const-GFileAttributeValue*" name="value"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="set_attribute_byte_string" symbol="g_file_set_attribute_byte_string">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="const-char*"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="const-char*" name="value"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="set_attribute_int32" symbol="g_file_set_attribute_int32">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="const-char*"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="gint32" name="value"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="set_attribute_int64" symbol="g_file_set_attribute_int64">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="gint64"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="gint64" name="value"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="set_attribute_string" symbol="g_file_set_attribute_string">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="const-char*"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="const-char*" name="value"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="set_attribute_uint32" symbol="g_file_set_attribute_uint32">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="guint32"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="guint32" name="value"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="set_attribute_uint64" symbol="g_file_set_attribute_uint64">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="guint64"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="guint64" name="value"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="set_attributes_from_info" symbol="g_file_set_attributes_from_info">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="set_display_name" symbol="g_file_set_display_name">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="display_name" type="const-char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="display_name"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="trash" symbol="g_file_trash">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="unmount_mountable" symbol="g_file_unmount_mountable">
         <return-type type="void"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="unmount_mountable_finish" symbol="g_file_unmount_mountable_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
     </interface>
-    <interface get-type="" name="GIcon" type-name="GIcon">
+    <interface name="GIcon" type-name="GIcon" get-type="">
       <vfunc name="hash">
         <return-type type="guint"/>
         <parameters>
-          <parameter name="icon" type="GIcon*"/>
+          <parameter type="GIcon*" name="icon"/>
         </parameters>
       </vfunc>
       <vfunc name="equal">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="icon1" type="GIcon*"/>
-          <parameter name="icon2" type="GIcon*"/>
+          <parameter type="GIcon*" name="icon1"/>
+          <parameter type="GIcon*" name="icon2"/>
         </parameters>
       </vfunc>
       <method name="equal" symbol="g_icon_equal">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="icon1" type="GIcon*"/>
-          <parameter name="icon2" type="GIcon*"/>
+          <parameter type="GIcon*" name="icon1"/>
+          <parameter type="GIcon*" name="icon2"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_icon_get_type">
@@ -1266,38 +1524,38 @@
       <method name="hash" symbol="g_icon_hash">
         <return-type type="guint"/>
         <parameters>
-          <parameter name="icon" type="gconstpointer"/>
+          <parameter type="gconstpointer" name="icon"/>
         </parameters>
       </method>
     </interface>
-    <interface get-type="" name="GLoadableIcon" type-name="GLoadableIcon">
+    <interface name="GLoadableIcon" type-name="GLoadableIcon" get-type="">
       <vfunc name="load">
         <return-type type="GInputStream*"/>
         <parameters>
-          <parameter name="icon" type="GLoadableIcon*"/>
-          <parameter name="size" type="int"/>
-          <parameter name="type" type="char**"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GLoadableIcon*" name="icon"/>
+          <parameter type="int" name="size"/>
+          <parameter type="char**" name="type"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="load_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="icon" type="GLoadableIcon*"/>
-          <parameter name="size" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GLoadableIcon*" name="icon"/>
+          <parameter type="int" name="size"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="load_finish">
         <return-type type="GInputStream*"/>
         <parameters>
-          <parameter name="icon" type="GLoadableIcon*"/>
-          <parameter name="res" type="GAsyncResult*"/>
-          <parameter name="type" type="char**"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GLoadableIcon*" name="icon"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="char**" name="type"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <method name="get_type" symbol="g_loadable_icon_get_type">
@@ -1306,81 +1564,81 @@
       <method name="load" symbol="g_loadable_icon_load">
         <return-type type="GInputStream*"/>
         <parameters>
-          <parameter name="icon" type="GLoadableIcon*"/>
-          <parameter name="size" type="int"/>
-          <parameter name="type" type="char**"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GLoadableIcon*" name="icon"/>
+          <parameter type="int" name="size"/>
+          <parameter type="char**" name="type"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="load_async" symbol="g_loadable_icon_load_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="icon" type="GLoadableIcon*"/>
-          <parameter name="size" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GLoadableIcon*" name="icon"/>
+          <parameter type="int" name="size"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="load_finish" symbol="g_loadable_icon_load_finish">
         <return-type type="GInputStream*"/>
         <parameters>
-          <parameter name="icon" type="GLoadableIcon*"/>
-          <parameter name="res" type="GAsyncResult*"/>
-          <parameter name="type" type="char**"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GLoadableIcon*" name="icon"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="char**" name="type"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
     </interface>
-    <interface get-type="" name="GSeekable" type-name="GSeekable">
+    <interface name="GSeekable" type-name="GSeekable" get-type="">
       <vfunc name="tell">
         <return-type type="goffset"/>
         <parameters>
-          <parameter name="seekable" type="GSeekable*"/>
+          <parameter type="GSeekable*" name="seekable"/>
         </parameters>
       </vfunc>
       <vfunc name="can_seek">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="seekable" type="GSeekable*"/>
+          <parameter type="GSeekable*" name="seekable"/>
         </parameters>
       </vfunc>
       <vfunc name="seek">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="seekable" type="GSeekable*"/>
-          <parameter name="offset" type="goffset"/>
-          <parameter name="type" type="GSeekType"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GSeekable*" name="seekable"/>
+          <parameter type="goffset" name="offset"/>
+          <parameter type="GSeekType" name="type"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="can_truncate">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="seekable" type="GSeekable*"/>
+          <parameter type="GSeekable*" name="seekable"/>
         </parameters>
       </vfunc>
       <vfunc name="truncate">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="seekable" type="GSeekable*"/>
-          <parameter name="offset" type="goffset"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GSeekable*" name="seekable"/>
+          <parameter type="goffset" name="offset"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <method name="can_seek" symbol="g_seekable_can_seek">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="seekable" type="GSeekable*"/>
+          <parameter type="GSeekable*" name="seekable"/>
         </parameters>
       </method>
       <method name="can_truncate" symbol="g_seekable_can_truncate">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="seekable" type="GSeekable*"/>
+          <parameter type="GSeekable*" name="seekable"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_seekable_get_type">
@@ -1389,216 +1647,160 @@
       <method name="seek" symbol="g_seekable_seek">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="seekable" type="GSeekable*"/>
-          <parameter name="offset" type="goffset"/>
-          <parameter name="type" type="GSeekType"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="err" type="GError**"/>
+          <parameter type="GSeekable*" name="seekable"/>
+          <parameter type="goffset" name="offset"/>
+          <parameter type="GSeekType" name="type"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="err"/>
         </parameters>
       </method>
       <method name="tell" symbol="g_seekable_tell">
         <return-type type="goffset"/>
         <parameters>
-          <parameter name="seekable" type="GSeekable*"/>
+          <parameter type="GSeekable*" name="seekable"/>
         </parameters>
       </method>
       <method name="truncate" symbol="g_seekable_truncate">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="seekable" type="GSeekable*"/>
-          <parameter name="offset" type="goffset"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="err" type="GError**"/>
-        </parameters>
-      </method>
-    </interface>
-    <interface get-type="" name="GVfs" type-name="GVfs">
-      <vfunc name="get_file_for_path">
-        <return-type type="GFile*"/>
-        <parameters>
-          <parameter name="vfs" type="GVfs*"/>
-          <parameter name="path" type="const-char*"/>
-        </parameters>
-      </vfunc>
-      <vfunc name="get_file_for_uri">
-        <return-type type="GFile*"/>
-        <parameters>
-          <parameter name="vfs" type="GVfs*"/>
-          <parameter name="uri" type="const-char*"/>
-        </parameters>
-      </vfunc>
-      <vfunc name="parse_name">
-        <return-type type="GFile*"/>
-        <parameters>
-          <parameter name="vfs" type="GVfs*"/>
-          <parameter name="parse_name" type="const-char*"/>
-        </parameters>
-      </vfunc>
-      <method name="get" symbol="g_vfs_get">
-        <return-type type="GVfs*"/>
-      </method>
-      <method name="get_file_for_path" symbol="g_vfs_get_file_for_path">
-        <return-type type="GFile*"/>
-        <parameters>
-          <parameter name="vfs" type="GVfs*"/>
-          <parameter name="path" type="const-char*"/>
-        </parameters>
-      </method>
-      <method name="get_file_for_uri" symbol="g_vfs_get_file_for_uri">
-        <return-type type="GFile*"/>
-        <parameters>
-          <parameter name="vfs" type="GVfs*"/>
-          <parameter name="uri" type="const-char*"/>
-        </parameters>
-      </method>
-      <method name="get_type" symbol="g_vfs_get_type">
-        <return-type type="GType"/>
-      </method>
-      <method name="parse_name" symbol="g_vfs_parse_name">
-        <return-type type="GFile*"/>
-        <parameters>
-          <parameter name="vfs" type="GVfs*"/>
-          <parameter name="parse_name" type="const-char*"/>
+          <parameter type="GSeekable*" name="seekable"/>
+          <parameter type="goffset" name="offset"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="err"/>
         </parameters>
       </method>
     </interface>
-    <interface get-type="" name="GVolume" type-name="GVolume">
+    <interface name="GVolume" type-name="GVolume" get-type="">
       <signal name="changed" when="LAST">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </signal>
       <vfunc name="get_root">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </vfunc>
       <vfunc name="get_name">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </vfunc>
       <vfunc name="get_icon">
-        <return-type type="char*"/>
+        <return-type type="GIcon*"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </vfunc>
       <vfunc name="get_drive">
         <return-type type="GDrive*"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </vfunc>
       <vfunc name="can_unmount">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </vfunc>
       <vfunc name="can_eject">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </vfunc>
       <vfunc name="unmount">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GVolume*" name="volume"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="unmount_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GVolume*" name="volume"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="eject">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GVolume*" name="volume"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="eject_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GVolume*" name="volume"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="get_platform_id">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </vfunc>
       <method name="can_eject" symbol="g_volume_can_eject">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </method>
       <method name="can_unmount" symbol="g_volume_can_unmount">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </method>
       <method name="eject" symbol="g_volume_eject">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GVolume*" name="volume"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="eject_finish" symbol="g_volume_eject_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GVolume*" name="volume"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="get_drive" symbol="g_volume_get_drive">
         <return-type type="GDrive*"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </method>
       <method name="get_icon" symbol="g_volume_get_icon">
-        <return-type type="char*"/>
+        <return-type type="GIcon*"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </method>
       <method name="get_name" symbol="g_volume_get_name">
         <return-type type="char*"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
-        </parameters>
-      </method>
-      <method name="get_platform_id" symbol="g_volume_get_platform_id">
-        <return-type type="char*"/>
-        <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </method>
       <method name="get_root" symbol="g_volume_get_root">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_volume_get_type">
@@ -1607,248 +1809,647 @@
       <method name="unmount" symbol="g_volume_unmount">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GVolume*" name="volume"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="unmount_finish" symbol="g_volume_unmount_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="volume" type="GVolume*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GVolume*" name="volume"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
     </interface>
-    <object get-type="" name="GBufferedInputStream" parent="GFilterInputStream" type-name="GBufferedInputStream">
-      <field name="priv" type="GBufferedInputStreamPrivate*"/>
-      <property construct-only="1" name="buffer-size" readable="1" type="guint" writable="1"/>
-      <method name="get_type" symbol="g_buffered_input_stream_get_type">
+    <object name="GIOModule" type-name="GIOModule" get-type="" parent="GTypeModule">
+      <method name="get_type" symbol="g_io_module_get_type">
         <return-type type="GType"/>
       </method>
-      <constructor name="new" symbol="g_buffered_input_stream_new">
-        <parameters>
-          <parameter name="base_stream" type="GInputStream*"/>
-        </parameters>
-      </constructor>
-      <constructor name="new_sized" symbol="g_buffered_input_stream_new_sized">
+      <method name="load" symbol="g_io_module_load">
+        <return-type type="void"/>
         <parameters>
-          <parameter name="base_stream" type="GInputStream*"/>
-          <parameter name="size" type="guint"/>
+          <parameter type="GIOModule*" name="module"/>
         </parameters>
-      </constructor>
-    </object>
-    <object get-type="" name="GBufferedOutputStream" parent="GFilterOutputStream" type-name="GBufferedOutputStream">
-      <field name="priv" type="GBufferedOutputStreamPrivate*"/>
-      <property construct-only="1" name="buffer-size" readable="1" type="guint" writable="1"/>
-      <method name="get_type" symbol="g_buffered_output_stream_get_type">
-        <return-type type="GType"/>
       </method>
-      <constructor name="new" symbol="g_buffered_output_stream_new">
+      <constructor name="new" symbol="g_io_module_new">
         <parameters>
-          <parameter name="base_stream" type="GOutputStream*"/>
+          <parameter type="const-gchar*" name="filename"/>
         </parameters>
       </constructor>
-      <constructor name="new_sized" symbol="g_buffered_output_stream_new_sized">
+      <method name="unload" symbol="g_io_module_unload">
+        <return-type type="void"/>
         <parameters>
-          <parameter name="base_stream" type="GOutputStream*"/>
-          <parameter name="size" type="guint"/>
+          <parameter type="GIOModule*" name="module"/>
         </parameters>
-      </constructor>
+      </method>
     </object>
-    <object get-type="" name="GCancellable" parent="GObject" type-name="GCancellable">
-      <signal name="cancelled" when="LAST">
-        <return-type type="void"/>
+    <object name="GBufferedInputStream" type-name="GBufferedInputStream" get-type="" parent="GFilterInputStream">
+      <field name="priv" type="GBufferedInputStreamPrivate*"/>
+      <property name="buffer-size" readable="1" writable="1" construct="1" type="guint"/>
+      <vfunc name="fill">
+        <return-type type="gssize"/>
         <parameters>
-          <parameter name="cancellable" type="GCancellable*"/>
+          <parameter type="GBufferedInputStream*" name="stream"/>
+          <parameter type="gssize" name="count"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
-      </signal>
-      <method name="cancel" symbol="g_cancellable_cancel">
+      </vfunc>
+      <vfunc name="fill_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="cancellable" type="GCancellable*"/>
+          <parameter type="GBufferedInputStream*" name="stream"/>
+          <parameter type="gssize" name="count"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="fill_finish">
+        <return-type type="gssize"/>
+        <parameters>
+          <parameter type="GBufferedInputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <method name="fill" symbol="g_buffered_input_stream_fill">
+        <return-type type="gssize"/>
+        <parameters>
+          <parameter type="GBufferedInputStream*" name="stream"/>
+          <parameter type="gssize" name="count"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_fd" symbol="g_cancellable_get_fd">
-        <return-type type="int"/>
+      <method name="fill_async" symbol="g_buffered_input_stream_fill_async">
+        <return-type type="void"/>
         <parameters>
-          <parameter name="cancellable" type="GCancellable*"/>
+          <parameter type="GBufferedInputStream*" name="stream"/>
+          <parameter type="gssize" name="count"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
-      <method name="get_type" symbol="g_cancellable_get_type">
-        <return-type type="GType"/>
+      <method name="fill_finish" symbol="g_buffered_input_stream_fill_finish">
+        <return-type type="gssize"/>
+        <parameters>
+          <parameter type="GBufferedInputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
       </method>
-      <method name="is_cancelled" symbol="g_cancellable_is_cancelled">
-        <return-type type="gboolean"/>
+      <method name="get_availible" symbol="g_buffered_input_stream_get_availible">
+        <return-type type="gsize"/>
         <parameters>
-          <parameter name="cancellable" type="GCancellable*"/>
+          <parameter type="GBufferedInputStream*" name="stream"/>
         </parameters>
       </method>
-      <constructor name="new" symbol="g_cancellable_new"/>
-      <method name="reset" symbol="g_cancellable_reset">
-        <return-type type="void"/>
+      <method name="get_buffer_size" symbol="g_buffered_input_stream_get_buffer_size">
+        <return-type type="gsize"/>
         <parameters>
-          <parameter name="cancellable" type="GCancellable*"/>
+          <parameter type="GBufferedInputStream*" name="stream"/>
         </parameters>
       </method>
-    </object>
-    <object get-type="" name="GDesktopAppInfo" parent="GObject" type-name="GDesktopAppInfo">
-      <implements>
-        <interface name="GAppInfo"/>
-      </implements>
-      <method name="get_type" symbol="g_desktop_app_info_get_type">
+      <method name="get_type" symbol="g_buffered_input_stream_get_type">
         <return-type type="GType"/>
       </method>
-      <constructor name="new" symbol="g_desktop_app_info_new">
+      <constructor name="new" symbol="g_buffered_input_stream_new">
+        <parameters>
+          <parameter type="GInputStream*" name="base_stream"/>
+        </parameters>
+      </constructor>
+      <constructor name="new_sized" symbol="g_buffered_input_stream_new_sized">
+        <parameters>
+          <parameter type="GInputStream*" name="base_stream"/>
+          <parameter type="gsize" name="size"/>
+        </parameters>
+      </constructor>
+      <method name="peek" symbol="g_buffered_input_stream_peek">
+        <return-type type="gsize"/>
+        <parameters>
+          <parameter type="GBufferedInputStream*" name="stream"/>
+          <parameter type="void*" name="buffer"/>
+          <parameter type="gsize" name="offset"/>
+          <parameter type="gsize" name="count"/>
+        </parameters>
+      </method>
+      <method name="set_buffer_size" symbol="g_buffered_input_stream_set_buffer_size">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GBufferedInputStream*" name="stream"/>
+          <parameter type="gsize" name="size"/>
+        </parameters>
+      </method>
+    </object>
+    <object name="GBufferedOutputStream" type-name="GBufferedOutputStream" get-type="" parent="GFilterOutputStream">
+      <field name="priv" type="GBufferedOutputStreamPrivate*"/>
+      <property name="buffer-size" readable="1" writable="1" construct-only="1" type="guint"/>
+      <method name="get_auto_grow" symbol="g_buffered_output_stream_get_auto_grow">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GBufferedOutputStream*" name="stream"/>
+        </parameters>
+      </method>
+      <method name="get_buffer_size" symbol="g_buffered_output_stream_get_buffer_size">
+        <return-type type="gsize"/>
+        <parameters>
+          <parameter type="GBufferedOutputStream*" name="stream"/>
+        </parameters>
+      </method>
+      <method name="get_type" symbol="g_buffered_output_stream_get_type">
+        <return-type type="GType"/>
+      </method>
+      <constructor name="new" symbol="g_buffered_output_stream_new">
+        <parameters>
+          <parameter type="GOutputStream*" name="base_stream"/>
+        </parameters>
+      </constructor>
+      <constructor name="new_sized" symbol="g_buffered_output_stream_new_sized">
+        <parameters>
+          <parameter type="GOutputStream*" name="base_stream"/>
+          <parameter type="guint" name="size"/>
+        </parameters>
+      </constructor>
+      <method name="set_auto_grow" symbol="g_buffered_output_stream_set_auto_grow">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GBufferedOutputStream*" name="stream"/>
+          <parameter type="gboolean" name="auto_grow"/>
+        </parameters>
+      </method>
+      <method name="set_buffer_size" symbol="g_buffered_output_stream_set_buffer_size">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GBufferedOutputStream*" name="stream"/>
+          <parameter type="gsize" name="size"/>
+        </parameters>
+      </method>
+    </object>
+    <object name="GCancellable" type-name="GCancellable" get-type="" parent="GObject">
+      <signal name="cancelled" when="LAST">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GCancellable*" name="cancellable"/>
+        </parameters>
+      </signal>
+      <method name="cancel" symbol="g_cancellable_cancel">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GCancellable*" name="cancellable"/>
+        </parameters>
+      </method>
+      <method name="get_current" symbol="g_cancellable_get_current">
+        <return-type type="GCancellable*"/>
+      </method>
+      <method name="get_fd" symbol="g_cancellable_get_fd">
+        <return-type type="int"/>
+        <parameters>
+          <parameter type="GCancellable*" name="cancellable"/>
+        </parameters>
+      </method>
+      <method name="get_type" symbol="g_cancellable_get_type">
+        <return-type type="GType"/>
+      </method>
+      <method name="is_cancelled" symbol="g_cancellable_is_cancelled">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GCancellable*" name="cancellable"/>
+        </parameters>
+      </method>
+      <constructor name="new" symbol="g_cancellable_new"/>
+      <method name="reset" symbol="g_cancellable_reset">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GCancellable*" name="cancellable"/>
+        </parameters>
+      </method>
+      <method name="set_error_if_cancelled" symbol="g_cancellable_set_error_if_cancelled">
+        <return-type type="gboolean"/>
         <parameters>
-          <parameter name="desktop_id" type="const-char*"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+    </object>
+    <object name="GDataInputStream" type-name="GDataInputStream" get-type="" parent="GBufferedInputStream">
+      <field name="priv" type="GDataInputStreamPrivate*"/>
+      <method name="get_byte" symbol="g_data_input_stream_get_byte">
+        <return-type type="guchar"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="get_byte_order" symbol="g_data_input_stream_get_byte_order">
+        <return-type type="GDataStreamByteOrder"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+        </parameters>
+      </method>
+      <method name="get_int16" symbol="g_data_input_stream_get_int16">
+        <return-type type="gint16"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="get_int32" symbol="g_data_input_stream_get_int32">
+        <return-type type="gint32"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="get_int64" symbol="g_data_input_stream_get_int64">
+        <return-type type="gint64"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="get_line" symbol="g_data_input_stream_get_line">
+        <return-type type="char*"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="gsize*" name="length"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="get_newline_type" symbol="g_data_input_stream_get_newline_type">
+        <return-type type="GDataStreamNewlineType"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+        </parameters>
+      </method>
+      <method name="get_type" symbol="g_data_input_stream_get_type">
+        <return-type type="GType"/>
+      </method>
+      <method name="get_uint16" symbol="g_data_input_stream_get_uint16">
+        <return-type type="guint16"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="get_uint32" symbol="g_data_input_stream_get_uint32">
+        <return-type type="guint32"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="get_uint64" symbol="g_data_input_stream_get_uint64">
+        <return-type type="guint64"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="get_until" symbol="g_data_input_stream_get_until">
+        <return-type type="char*"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="gchar" name="stop_char"/>
+          <parameter type="gsize*" name="length"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <constructor name="new" symbol="g_data_input_stream_new">
+        <parameters>
+          <parameter type="GInputStream*" name="base_stream"/>
         </parameters>
       </constructor>
+      <method name="set_byte_order" symbol="g_data_input_stream_set_byte_order">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="GDataStreamByteOrder" name="order"/>
+        </parameters>
+      </method>
+      <method name="set_newline_type" symbol="g_data_input_stream_set_newline_type">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="GDataStreamNewlineType" name="type"/>
+        </parameters>
+      </method>
     </object>
-    <object get-type="" name="GDirectoryMonitor" parent="GObject" type-name="GDirectoryMonitor">
+    <object name="GDataOutputStream" type-name="GDataOutputStream" get-type="" parent="GFilterOutputStream">
+      <field name="priv" type="GDataOutputStreamPrivate*"/>
+      <method name="get_byte_order" symbol="g_data_output_stream_get_byte_order">
+        <return-type type="GDataStreamByteOrder"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+        </parameters>
+      </method>
+      <method name="get_type" symbol="g_data_output_stream_get_type">
+        <return-type type="GType"/>
+      </method>
+      <constructor name="new" symbol="g_data_output_stream_new">
+        <parameters>
+          <parameter type="GOutputStream*" name="base_stream"/>
+        </parameters>
+      </constructor>
+      <method name="put_byte" symbol="g_data_output_stream_put_byte">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+          <parameter type="guchar" name="data"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="put_int16" symbol="g_data_output_stream_put_int16">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+          <parameter type="gint16" name="data"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="put_int32" symbol="g_data_output_stream_put_int32">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+          <parameter type="gint32" name="data"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="put_int64" symbol="g_data_output_stream_put_int64">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+          <parameter type="gint64" name="data"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="put_string" symbol="g_data_output_stream_put_string">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+          <parameter type="char*" name="str"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="put_uint16" symbol="g_data_output_stream_put_uint16">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+          <parameter type="guint16" name="data"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="put_uint32" symbol="g_data_output_stream_put_uint32">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+          <parameter type="guint32" name="data"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="put_uint64" symbol="g_data_output_stream_put_uint64">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+          <parameter type="guint64" name="data"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="set_byte_order" symbol="g_data_output_stream_set_byte_order">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+          <parameter type="GDataStreamByteOrder" name="order"/>
+        </parameters>
+      </method>
+      <method name="set_expand_buffer" symbol="g_data_output_stream_set_expand_buffer">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GDataOutputStream*" name="data_stream"/>
+          <parameter type="gboolean" name="expand_buffer"/>
+        </parameters>
+      </method>
+    </object>
+    <object name="GDesktopAppInfo" type-name="GDesktopAppInfo" get-type="" parent="GObject">
+      <implements>
+        <interface name="GAppInfo"/>
+      </implements>
+      <method name="get_type" symbol="g_desktop_app_info_get_type">
+        <return-type type="GType"/>
+      </method>
+      <constructor name="new" symbol="g_desktop_app_info_new">
+        <parameters>
+          <parameter type="const-char*" name="desktop_id"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="GDirectoryMonitor" type-name="GDirectoryMonitor" get-type="" parent="GObject">
       <field name="priv" type="GDirectoryMonitorPrivate*"/>
       <signal name="changed" when="LAST">
         <return-type type="void"/>
         <parameters>
-          <parameter name="monitor" type="GDirectoryMonitor*"/>
-          <parameter name="child" type="GFile*"/>
-          <parameter name="other_file" type="GFile*"/>
-          <parameter name="event_type" type="GDirectoryMonitorEvent"/>
+          <parameter type="GDirectoryMonitor*" name="monitor"/>
+          <parameter type="GFile*" name="child"/>
+          <parameter type="GFile*" name="other_file"/>
+          <parameter type="GFileMonitorEvent" name="event_type"/>
         </parameters>
       </signal>
       <vfunc name="cancel">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="monitor" type="GDirectoryMonitor*"/>
+          <parameter type="GDirectoryMonitor*" name="monitor"/>
         </parameters>
       </vfunc>
       <method name="cancel" symbol="g_directory_monitor_cancel">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="monitor" type="GDirectoryMonitor*"/>
-        </parameters>
-      </method>
-      <method name="emit_event" symbol="g_directory_monitor_emit_event">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="monitor" type="GDirectoryMonitor*"/>
-          <parameter name="child" type="GFile*"/>
-          <parameter name="other_file" type="GFile*"/>
-          <parameter name="event_type" type="GDirectoryMonitorEvent"/>
+          <parameter type="GDirectoryMonitor*" name="monitor"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_directory_monitor_get_type">
         <return-type type="GType"/>
       </method>
+      <method name="is_cancelled" symbol="g_directory_monitor_is_cancelled">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GDirectoryMonitor*" name="monitor"/>
+        </parameters>
+      </method>
       <method name="set_rate_limit" symbol="g_directory_monitor_set_rate_limit">
         <return-type type="void"/>
         <parameters>
-          <parameter name="monitor" type="GDirectoryMonitor*"/>
-          <parameter name="limit_msecs" type="int"/>
+          <parameter type="GDirectoryMonitor*" name="monitor"/>
+          <parameter type="int" name="limit_msecs"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GFileEnumerator" parent="GObject" type-name="GFileEnumerator">
+    <object name="GDummyFile" type-name="GDummyFile" get-type="" parent="GObject">
+      <implements>
+        <interface name="GFile"/>
+      </implements>
+      <method name="get_type" symbol="g_dummy_file_get_type">
+        <return-type type="GType"/>
+      </method>
+      <constructor name="new" symbol="g_dummy_file_new">
+        <parameters>
+          <parameter type="const-char*" name="uri"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="GFileEnumerator" type-name="GFileEnumerator" get-type="" parent="GObject">
       <field name="priv" type="GFileEnumeratorPrivate*"/>
       <vfunc name="next_file">
         <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
-      <vfunc name="stop">
+      <vfunc name="close">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="next_files_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
-          <parameter name="num_files" type="int"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="callback" type="GAsyncNextFilesCallback"/>
-          <parameter name="user_data" type="gpointer"/>
-          <parameter name="cancellable" type="GCancellable*"/>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="int" name="num_files"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
-      <vfunc name="stop_async">
+      <vfunc name="next_files_finish">
+        <return-type type="GList*"/>
+        <parameters>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="close_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="callback" type="GAsyncStopEnumeratingCallback"/>
-          <parameter name="user_data" type="gpointer"/>
-          <parameter name="cancellable" type="GCancellable*"/>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="close_finish">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
+      <method name="close" symbol="g_file_enumerator_close">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="close_async" symbol="g_file_enumerator_close_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="close_finish" symbol="g_file_enumerator_close_finish">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
       <method name="get_type" symbol="g_file_enumerator_get_type">
         <return-type type="GType"/>
       </method>
       <method name="has_pending" symbol="g_file_enumerator_has_pending">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
         </parameters>
       </method>
-      <method name="is_stopped" symbol="g_file_enumerator_is_stopped">
+      <method name="is_closed" symbol="g_file_enumerator_is_closed">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
         </parameters>
       </method>
       <method name="next_file" symbol="g_file_enumerator_next_file">
         <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="next_files_async" symbol="g_file_enumerator_next_files_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
-          <parameter name="num_files" type="int"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="callback" type="GAsyncNextFilesCallback"/>
-          <parameter name="user_data" type="gpointer"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-        </parameters>
-      </method>
-      <method name="set_pending" symbol="g_file_enumerator_set_pending">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
-          <parameter name="pending" type="gboolean"/>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="int" name="num_files"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
-      <method name="stop" symbol="g_file_enumerator_stop">
-        <return-type type="gboolean"/>
+      <method name="next_files_finish" symbol="g_file_enumerator_next_files_finish">
+        <return-type type="GList*"/>
         <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="stop_async" symbol="g_file_enumerator_stop_async">
+      <method name="set_pending" symbol="g_file_enumerator_set_pending">
         <return-type type="void"/>
         <parameters>
-          <parameter name="enumerator" type="GFileEnumerator*"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="callback" type="GAsyncStopEnumeratingCallback"/>
-          <parameter name="user_data" type="gpointer"/>
-          <parameter name="cancellable" type="GCancellable*"/>
+          <parameter type="GFileEnumerator*" name="enumerator"/>
+          <parameter type="gboolean" name="pending"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GFileIcon" parent="GObject" type-name="GFileIcon">
+    <object name="GFileIcon" type-name="GFileIcon" get-type="" parent="GObject">
       <implements>
         <interface name="GIcon"/>
         <interface name="GLoadableIcon"/>
@@ -1856,7 +2457,7 @@
       <method name="get_file" symbol="g_file_icon_get_file">
         <return-type type="GFile*"/>
         <parameters>
-          <parameter name="icon" type="GFileIcon*"/>
+          <parameter type="GFileIcon*" name="icon"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_file_icon_get_type">
@@ -1864,132 +2465,177 @@
       </method>
       <constructor name="new" symbol="g_file_icon_new">
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
         </parameters>
       </constructor>
     </object>
-    <object get-type="" name="GFileInfo" parent="GObject" type-name="GFileInfo">
-      <method name="copy" symbol="g_file_info_copy">
+    <object name="GFileInfo" type-name="GFileInfo" get-type="" parent="GObject">
+      <method name="clear_status" symbol="g_file_info_clear_status">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+        </parameters>
+      </method>
+      <method name="copy_into" symbol="g_file_info_copy_into">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="src"/>
+          <parameter type="GFileInfo*" name="dest"/>
+        </parameters>
+      </method>
+      <method name="dup" symbol="g_file_info_dup">
         <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
-      <method name="get_attribute_as_string" symbol="g_file_info_get_attribute_as_string">
-        <return-type type="char*"/>
+      <method name="get_attribute" symbol="g_file_info_get_attribute">
+        <return-type type="GFileAttributeValue*"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+        </parameters>
+      </method>
+      <method name="get_attribute_boolean" symbol="g_file_info_get_attribute_boolean">
+        <return-type type="gboolean"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
         </parameters>
       </method>
       <method name="get_attribute_byte_string" symbol="g_file_info_get_attribute_byte_string">
         <return-type type="const-char*"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
         </parameters>
       </method>
       <method name="get_attribute_int32" symbol="g_file_info_get_attribute_int32">
         <return-type type="gint32"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
         </parameters>
       </method>
       <method name="get_attribute_int64" symbol="g_file_info_get_attribute_int64">
         <return-type type="gint64"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+        </parameters>
+      </method>
+      <method name="get_attribute_object" symbol="g_file_info_get_attribute_object">
+        <return-type type="GObject*"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
         </parameters>
       </method>
       <method name="get_attribute_string" symbol="g_file_info_get_attribute_string">
         <return-type type="const-char*"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
         </parameters>
       </method>
       <method name="get_attribute_type" symbol="g_file_info_get_attribute_type">
         <return-type type="GFileAttributeType"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
         </parameters>
       </method>
       <method name="get_attribute_uint32" symbol="g_file_info_get_attribute_uint32">
         <return-type type="guint32"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
         </parameters>
       </method>
       <method name="get_attribute_uint64" symbol="g_file_info_get_attribute_uint64">
         <return-type type="guint64"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
         </parameters>
       </method>
       <method name="get_content_type" symbol="g_file_info_get_content_type">
         <return-type type="const-char*"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
       <method name="get_display_name" symbol="g_file_info_get_display_name">
         <return-type type="const-char*"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
       <method name="get_edit_name" symbol="g_file_info_get_edit_name">
         <return-type type="const-char*"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
+          <parameter type="GFileInfo*" name="info"/>
+        </parameters>
+      </method>
+      <method name="get_etag" symbol="g_file_info_get_etag">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
       <method name="get_file_type" symbol="g_file_info_get_file_type">
         <return-type type="GFileType"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
-      <method name="get_flags" symbol="g_file_info_get_flags">
-        <return-type type="GFileFlags"/>
+      <method name="get_icon" symbol="g_file_info_get_icon">
+        <return-type type="GIcon*"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
-      <method name="get_icon" symbol="g_file_info_get_icon">
-        <return-type type="const-char*"/>
+      <method name="get_is_hidden" symbol="g_file_info_get_is_hidden">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+        </parameters>
+      </method>
+      <method name="get_is_symlink" symbol="g_file_info_get_is_symlink">
+        <return-type type="gboolean"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
       <method name="get_modification_time" symbol="g_file_info_get_modification_time">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="result" type="GTimeVal*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="GTimeVal*" name="result"/>
         </parameters>
       </method>
       <method name="get_name" symbol="g_file_info_get_name">
         <return-type type="const-char*"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
       <method name="get_size" symbol="g_file_info_get_size">
         <return-type type="goffset"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
+          <parameter type="GFileInfo*" name="info"/>
+        </parameters>
+      </method>
+      <method name="get_sort_order" symbol="g_file_info_get_sort_order">
+        <return-type type="gint32"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
       <method name="get_symlink_target" symbol="g_file_info_get_symlink_target">
         <return-type type="const-char*"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_file_info_get_type">
@@ -1998,457 +2644,573 @@
       <method name="has_attribute" symbol="g_file_info_has_attribute">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
         </parameters>
       </method>
       <method name="list_attributes" symbol="g_file_info_list_attributes">
         <return-type type="char**"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="name_space" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="name_space"/>
         </parameters>
       </method>
       <constructor name="new" symbol="g_file_info_new"/>
       <method name="remove_attribute" symbol="g_file_info_remove_attribute">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+        </parameters>
+      </method>
+      <method name="set_attribute" symbol="g_file_info_set_attribute">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="const-GFileAttributeValue*" name="value"/>
+        </parameters>
+      </method>
+      <method name="set_attribute_boolean" symbol="g_file_info_set_attribute_boolean">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="gboolean" name="value"/>
         </parameters>
       </method>
       <method name="set_attribute_byte_string" symbol="g_file_info_set_attribute_byte_string">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="const-char*" name="value"/>
         </parameters>
       </method>
       <method name="set_attribute_int32" symbol="g_file_info_set_attribute_int32">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="gint32"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="gint32" name="value"/>
         </parameters>
       </method>
       <method name="set_attribute_int64" symbol="g_file_info_set_attribute_int64">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="gint64"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="gint64" name="value"/>
+        </parameters>
+      </method>
+      <method name="set_attribute_mask" symbol="g_file_info_set_attribute_mask">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="GFileAttributeMatcher*" name="mask"/>
+        </parameters>
+      </method>
+      <method name="set_attribute_object" symbol="g_file_info_set_attribute_object">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="GObject*" name="value"/>
         </parameters>
       </method>
       <method name="set_attribute_string" symbol="g_file_info_set_attribute_string">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="const-char*" name="value"/>
         </parameters>
       </method>
       <method name="set_attribute_uint32" symbol="g_file_info_set_attribute_uint32">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="guint32"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="guint32" name="value"/>
         </parameters>
       </method>
       <method name="set_attribute_uint64" symbol="g_file_info_set_attribute_uint64">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="attribute" type="const-char*"/>
-          <parameter name="value" type="guint64"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="guint64" name="value"/>
         </parameters>
       </method>
       <method name="set_content_type" symbol="g_file_info_set_content_type">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="content_type" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="content_type"/>
         </parameters>
       </method>
       <method name="set_display_name" symbol="g_file_info_set_display_name">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="display_name" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="display_name"/>
         </parameters>
       </method>
       <method name="set_edit_name" symbol="g_file_info_set_edit_name">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="edit_name" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="edit_name"/>
         </parameters>
       </method>
       <method name="set_file_type" symbol="g_file_info_set_file_type">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="type" type="GFileType"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="GFileType" name="type"/>
         </parameters>
       </method>
-      <method name="set_flags" symbol="g_file_info_set_flags">
+      <method name="set_icon" symbol="g_file_info_set_icon">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="flags" type="GFileFlags"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="GIcon*" name="icon"/>
         </parameters>
       </method>
-      <method name="set_icon" symbol="g_file_info_set_icon">
+      <method name="set_is_hidden" symbol="g_file_info_set_is_hidden">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="gboolean" name="is_hidden"/>
+        </parameters>
+      </method>
+      <method name="set_is_symlink" symbol="g_file_info_set_is_symlink">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="icon" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="gboolean" name="is_symlink"/>
         </parameters>
       </method>
       <method name="set_modification_time" symbol="g_file_info_set_modification_time">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="mtime" type="GTimeVal*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="GTimeVal*" name="mtime"/>
         </parameters>
       </method>
       <method name="set_name" symbol="g_file_info_set_name">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="name" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="name"/>
         </parameters>
       </method>
       <method name="set_size" symbol="g_file_info_set_size">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="size" type="goffset"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="goffset" name="size"/>
+        </parameters>
+      </method>
+      <method name="set_sort_order" symbol="g_file_info_set_sort_order">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="gint32" name="sort_order"/>
+        </parameters>
+      </method>
+      <method name="set_symlink_target" symbol="g_file_info_set_symlink_target">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="const-char*" name="symlink_target"/>
         </parameters>
       </method>
-      <method name="set_symlink_target" symbol="g_file_info_set_symlink_target">
+      <method name="unset_attribute_mask" symbol="g_file_info_unset_attribute_mask">
         <return-type type="void"/>
         <parameters>
-          <parameter name="info" type="GFileInfo*"/>
-          <parameter name="symlink_target" type="const-char*"/>
+          <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GFileInputStream" parent="GInputStream" type-name="GFileInputStream">
+    <object name="GFileInputStream" type-name="GFileInputStream" get-type="" parent="GInputStream">
       <field name="priv" type="GFileInputStreamPrivate*"/>
       <vfunc name="tell">
         <return-type type="goffset"/>
         <parameters>
-          <parameter name="stream" type="GFileInputStream*"/>
+          <parameter type="GFileInputStream*" name="stream"/>
         </parameters>
       </vfunc>
       <vfunc name="can_seek">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GFileInputStream*"/>
+          <parameter type="GFileInputStream*" name="stream"/>
         </parameters>
       </vfunc>
       <vfunc name="seek">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GFileInputStream*"/>
-          <parameter name="offset" type="goffset"/>
-          <parameter name="type" type="GSeekType"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFileInputStream*" name="stream"/>
+          <parameter type="goffset" name="offset"/>
+          <parameter type="GSeekType" name="type"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="get_file_info">
         <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="stream" type="GFileInputStream*"/>
-          <parameter name="attributes" type="char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFileInputStream*" name="stream"/>
+          <parameter type="char*" name="attributes"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <implements>
         <interface name="GSeekable"/>
       </implements>
+      <method name="can_seek" symbol="g_file_input_stream_can_seek">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileInputStream*" name="stream"/>
+        </parameters>
+      </method>
       <method name="get_file_info" symbol="g_file_input_stream_get_file_info">
         <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="stream" type="GFileInputStream*"/>
-          <parameter name="attributes" type="char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFileInputStream*" name="stream"/>
+          <parameter type="char*" name="attributes"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_file_input_stream_get_type">
         <return-type type="GType"/>
       </method>
+      <method name="seek" symbol="g_file_input_stream_seek">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileInputStream*" name="stream"/>
+          <parameter type="goffset" name="offset"/>
+          <parameter type="GSeekType" name="type"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="tell" symbol="g_file_input_stream_tell">
+        <return-type type="goffset"/>
+        <parameters>
+          <parameter type="GFileInputStream*" name="stream"/>
+        </parameters>
+      </method>
     </object>
-    <object get-type="" name="GFileMonitor" parent="GObject" type-name="GFileMonitor">
+    <object name="GFileMonitor" type-name="GFileMonitor" get-type="" parent="GObject">
       <field name="priv" type="GFileMonitorPrivate*"/>
       <signal name="changed" when="LAST">
         <return-type type="void"/>
         <parameters>
-          <parameter name="monitor" type="GFileMonitor*"/>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="other_file" type="GFile*"/>
-          <parameter name="event_type" type="GFileMonitorEvent"/>
+          <parameter type="GFileMonitor*" name="monitor"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GFile*" name="other_file"/>
+          <parameter type="GFileMonitorEvent" name="event_type"/>
         </parameters>
       </signal>
       <vfunc name="cancel">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="monitor" type="GFileMonitor*"/>
+          <parameter type="GFileMonitor*" name="monitor"/>
         </parameters>
       </vfunc>
       <method name="cancel" symbol="g_file_monitor_cancel">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="monitor" type="GFileMonitor*"/>
+          <parameter type="GFileMonitor*" name="monitor"/>
         </parameters>
       </method>
       <method name="directory" symbol="g_file_monitor_directory">
         <return-type type="GDirectoryMonitor*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
-        </parameters>
-      </method>
-      <method name="emit_event" symbol="g_file_monitor_emit_event">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="monitor" type="GFileMonitor*"/>
-          <parameter name="file" type="GFile*"/>
-          <parameter name="other_file" type="GFile*"/>
-          <parameter name="event_type" type="GFileMonitorEvent"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GFileMonitorFlags" name="flags"/>
         </parameters>
       </method>
       <method name="file" symbol="g_file_monitor_file">
         <return-type type="GFileMonitor*"/>
         <parameters>
-          <parameter name="file" type="GFile*"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GFileMonitorFlags" name="flags"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_file_monitor_get_type">
         <return-type type="GType"/>
       </method>
+      <method name="is_cancelled" symbol="g_file_monitor_is_cancelled">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileMonitor*" name="monitor"/>
+        </parameters>
+      </method>
       <method name="set_rate_limit" symbol="g_file_monitor_set_rate_limit">
         <return-type type="void"/>
         <parameters>
-          <parameter name="monitor" type="GFileMonitor*"/>
-          <parameter name="limit_msecs" type="int"/>
+          <parameter type="GFileMonitor*" name="monitor"/>
+          <parameter type="int" name="limit_msecs"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GFileOutputStream" parent="GOutputStream" type-name="GFileOutputStream">
+    <object name="GFileOutputStream" type-name="GFileOutputStream" get-type="" parent="GOutputStream">
       <field name="priv" type="GFileOutputStreamPrivate*"/>
       <vfunc name="tell">
         <return-type type="goffset"/>
         <parameters>
-          <parameter name="stream" type="GFileOutputStream*"/>
+          <parameter type="GFileOutputStream*" name="stream"/>
         </parameters>
       </vfunc>
       <vfunc name="can_seek">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GFileOutputStream*"/>
+          <parameter type="GFileOutputStream*" name="stream"/>
         </parameters>
       </vfunc>
       <vfunc name="seek">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GFileOutputStream*"/>
-          <parameter name="offset" type="goffset"/>
-          <parameter name="type" type="GSeekType"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="goffset" name="offset"/>
+          <parameter type="GSeekType" name="type"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="can_truncate">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileOutputStream*" name="stream"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="truncate">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="goffset" name="size"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="get_file_info">
         <return-type type="GFileInfo*"/>
         <parameters>
-          <parameter name="stream" type="GFileOutputStream*"/>
-          <parameter name="attributes" type="char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="char*" name="attributes"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
-      <method name="get_file_info" symbol="g_file_output_stream_get_file_info">
-        <return-type type="GFileInfo*"/>
+      <vfunc name="get_etag">
+        <return-type type="char*"/>
         <parameters>
-          <parameter name="stream" type="GFileOutputStream*"/>
-          <parameter name="attributes" type="char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
-      </method>
-      <method name="get_final_mtime" symbol="g_file_output_stream_get_final_mtime">
-        <return-type type="void"/>
+      </vfunc>
+      <implements>
+        <interface name="GSeekable"/>
+      </implements>
+      <method name="can_seek" symbol="g_file_output_stream_can_seek">
+        <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GFileOutputStream*"/>
-          <parameter name="mtime" type="GTimeVal*"/>
+          <parameter type="GFileOutputStream*" name="stream"/>
         </parameters>
       </method>
-      <method name="get_should_get_final_mtime" symbol="g_file_output_stream_get_should_get_final_mtime">
+      <method name="can_truncate" symbol="g_file_output_stream_can_truncate">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GFileOutputStream*"/>
+          <parameter type="GFileOutputStream*" name="stream"/>
+        </parameters>
+      </method>
+      <method name="get_etag" symbol="g_file_output_stream_get_etag">
+        <return-type type="char*"/>
+        <parameters>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="get_file_info" symbol="g_file_output_stream_get_file_info">
+        <return-type type="GFileInfo*"/>
+        <parameters>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="char*" name="attributes"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_file_output_stream_get_type">
         <return-type type="GType"/>
       </method>
-      <method name="set_final_mtime" symbol="g_file_output_stream_set_final_mtime">
-        <return-type type="void"/>
+      <method name="seek" symbol="g_file_output_stream_seek">
+        <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GFileOutputStream*"/>
-          <parameter name="final_mtime" type="GTimeVal*"/>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="goffset" name="offset"/>
+          <parameter type="GSeekType" name="type"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="set_should_get_final_mtime" symbol="g_file_output_stream_set_should_get_final_mtime">
-        <return-type type="void"/>
+      <method name="tell" symbol="g_file_output_stream_tell">
+        <return-type type="goffset"/>
+        <parameters>
+          <parameter type="GFileOutputStream*" name="stream"/>
+        </parameters>
+      </method>
+      <method name="truncate" symbol="g_file_output_stream_truncate">
+        <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GFileOutputStream*"/>
-          <parameter name="get_final_mtime" type="gboolean"/>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="goffset" name="size"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GFilterInputStream" parent="GInputStream" type-name="GFilterInputStream">
+    <object name="GFilterInputStream" type-name="GFilterInputStream" get-type="" parent="GInputStream">
       <field name="base_stream" type="GInputStream*"/>
-      <property construct-only="1" name="base-stream" readable="1" type="GInputStream" writable="1"/>
+      <property name="base-stream" readable="1" writable="1" construct-only="1" type="GInputStream"/>
       <method name="get_base_stream" symbol="g_filter_input_stream_get_base_stream">
         <return-type type="GInputStream*"/>
         <parameters>
-          <parameter name="stream" type="GFilterInputStream*"/>
+          <parameter type="GFilterInputStream*" name="stream"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_filter_input_stream_get_type">
         <return-type type="GType"/>
       </method>
     </object>
-    <object get-type="" name="GFilterOutputStream" parent="GOutputStream" type-name="GFilterOutputStream">
+    <object name="GFilterOutputStream" type-name="GFilterOutputStream" get-type="" parent="GOutputStream">
       <field name="base_stream" type="GOutputStream*"/>
-      <property construct-only="1" name="base-stream" readable="1" type="GOutputStream" writable="1"/>
+      <property name="base-stream" readable="1" writable="1" construct-only="1" type="GOutputStream"/>
       <method name="get_base_stream" symbol="g_filter_output_stream_get_base_stream">
         <return-type type="GOutputStream*"/>
         <parameters>
-          <parameter name="stream" type="GFilterOutputStream*"/>
+          <parameter type="GFilterOutputStream*" name="stream"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_filter_output_stream_get_type">
         <return-type type="GType"/>
       </method>
     </object>
-    <object get-type="" name="GInputStream" parent="GObject" type-name="GInputStream">
+    <object name="GInputStream" type-name="GInputStream" get-type="" parent="GObject">
       <field name="priv" type="GInputStreamPrivate*"/>
       <vfunc name="read">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="buffer" type="void*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="void*" name="buffer"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="skip">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="close">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="read_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="buffer" type="void*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="void*" name="buffer"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="read_finish">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="skip_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="skip_finish">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="close_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="close_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <method name="close" symbol="g_input_stream_close">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="close_async" symbol="g_input_stream_close_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="close_finish" symbol="g_input_stream_close_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_input_stream_get_type">
@@ -2457,195 +3219,168 @@
       <method name="has_pending" symbol="g_input_stream_has_pending">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
+          <parameter type="GInputStream*" name="stream"/>
         </parameters>
       </method>
       <method name="is_closed" symbol="g_input_stream_is_closed">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
+          <parameter type="GInputStream*" name="stream"/>
         </parameters>
       </method>
       <method name="read" symbol="g_input_stream_read">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="buffer" type="void*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="void*" name="buffer"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="read_all" symbol="g_input_stream_read_all">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="buffer" type="void*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="bytes_read" type="gsize*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="void*" name="buffer"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="gsize*" name="bytes_read"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="read_async" symbol="g_input_stream_read_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="buffer" type="void*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="void*" name="buffer"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="read_finish" symbol="g_input_stream_read_finish">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="set_pending" symbol="g_input_stream_set_pending">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="pending" type="gboolean"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="gboolean" name="pending"/>
         </parameters>
       </method>
       <method name="skip" symbol="g_input_stream_skip">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="skip_async" symbol="g_input_stream_skip_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="skip_finish" symbol="g_input_stream_skip_finish">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GInputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GInputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GLocalDirectoryMonitor" parent="GDirectoryMonitor" type-name="GLocalDirectoryMonitor">
+    <object name="GLocalDirectoryMonitor" type-name="GLocalDirectoryMonitor" get-type="" parent="GDirectoryMonitor">
       <method name="get_type" symbol="g_local_directory_monitor_get_type">
         <return-type type="GType"/>
       </method>
-      <method name="start" symbol="g_local_directory_monitor_start">
-        <return-type type="GDirectoryMonitor*"/>
+      <constructor name="new" symbol="g_local_directory_monitor_new">
         <parameters>
-          <parameter name="dirname" type="const-char*"/>
+          <parameter type="const-char*" name="dirname"/>
+          <parameter type="GFileMonitorFlags" name="flags"/>
         </parameters>
-      </method>
+      </constructor>
     </object>
-    <object get-type="" name="GLocalFile" parent="GObject" type-name="GLocalFile">
+    <object name="GLocalFile" type-name="GLocalFile" get-type="" parent="GObject">
       <implements>
         <interface name="GFile"/>
       </implements>
       <method name="get_type" symbol="g_local_file_get_type">
         <return-type type="GType"/>
       </method>
-      <method name="info_get" symbol="g_local_file_info_get">
-        <return-type type="GFileInfo*"/>
-        <parameters>
-          <parameter name="basename" type="const-char*"/>
-          <parameter name="path" type="const-char*"/>
-          <parameter name="attribute_matcher" type="GFileAttributeMatcher*"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="parent_info" type="GLocalParentFileInfo*"/>
-          <parameter name="error" type="GError**"/>
-        </parameters>
-      </method>
-      <method name="info_get_from_fd" symbol="g_local_file_info_get_from_fd">
-        <return-type type="GFileInfo*"/>
-        <parameters>
-          <parameter name="fd" type="int"/>
-          <parameter name="attributes" type="char*"/>
-          <parameter name="error" type="GError**"/>
-        </parameters>
-      </method>
-      <method name="info_get_parent_info" symbol="g_local_file_info_get_parent_info">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="dir" type="const-char*"/>
-          <parameter name="attribute_matcher" type="GFileAttributeMatcher*"/>
-          <parameter name="parent_info" type="GLocalParentFileInfo*"/>
-        </parameters>
-      </method>
       <constructor name="new" symbol="g_local_file_new">
         <parameters>
-          <parameter name="filename" type="const-char*"/>
+          <parameter type="const-char*" name="filename"/>
         </parameters>
       </constructor>
     </object>
-    <object get-type="" name="GLocalFileEnumerator" parent="GFileEnumerator" type-name="GLocalFileEnumerator">
+    <object name="GLocalFileEnumerator" type-name="GLocalFileEnumerator" get-type="" parent="GFileEnumerator">
       <method name="get_type" symbol="g_local_file_enumerator_get_type">
         <return-type type="GType"/>
       </method>
       <constructor name="new" symbol="g_local_file_enumerator_new">
         <parameters>
-          <parameter name="filename" type="const-char*"/>
-          <parameter name="attributes" type="const-char*"/>
-          <parameter name="flags" type="GFileGetInfoFlags"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="const-char*" name="filename"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </constructor>
     </object>
-    <object get-type="" name="GLocalFileInputStream" parent="GFileInputStream" type-name="GLocalFileInputStream">
+    <object name="GLocalFileInputStream" type-name="GLocalFileInputStream" get-type="" parent="GFileInputStream">
       <field name="priv" type="GLocalFileInputStreamPrivate*"/>
       <method name="get_type" symbol="g_local_file_input_stream_get_type">
         <return-type type="GType"/>
       </method>
       <constructor name="new" symbol="g_local_file_input_stream_new">
         <parameters>
-          <parameter name="fd" type="int"/>
+          <parameter type="int" name="fd"/>
         </parameters>
       </constructor>
     </object>
-    <object get-type="" name="GLocalFileMonitor" parent="GFileMonitor" type-name="GLocalFileMonitor">
+    <object name="GLocalFileMonitor" type-name="GLocalFileMonitor" get-type="" parent="GFileMonitor">
       <method name="get_type" symbol="g_local_file_monitor_get_type">
         <return-type type="GType"/>
       </method>
-      <method name="start" symbol="g_local_file_monitor_start">
-        <return-type type="GFileMonitor*"/>
+      <constructor name="new" symbol="g_local_file_monitor_new">
         <parameters>
-          <parameter name="dirname" type="const-char*"/>
+          <parameter type="const-char*" name="dirname"/>
+          <parameter type="GFileMonitorFlags" name="flags"/>
         </parameters>
-      </method>
+      </constructor>
     </object>
-    <object get-type="" name="GLocalFileOutputStream" parent="GFileOutputStream" type-name="GLocalFileOutputStream">
+    <object name="GLocalFileOutputStream" type-name="GLocalFileOutputStream" get-type="" parent="GFileOutputStream">
       <field name="priv" type="GLocalFileOutputStreamPrivate*"/>
       <method name="append" symbol="g_local_file_output_stream_append">
         <return-type type="GFileOutputStream*"/>
         <parameters>
-          <parameter name="filename" type="const-char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="const-char*" name="filename"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="create" symbol="g_local_file_output_stream_create">
         <return-type type="GFileOutputStream*"/>
         <parameters>
-          <parameter name="filename" type="const-char*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="const-char*" name="filename"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_local_file_output_stream_get_type">
@@ -2654,24 +3389,21 @@
       <method name="replace" symbol="g_local_file_output_stream_replace">
         <return-type type="GFileOutputStream*"/>
         <parameters>
-          <parameter name="filename" type="const-char*"/>
-          <parameter name="mtime" type="time_t"/>
-          <parameter name="make_backup" type="gboolean"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="const-char*" name="filename"/>
+          <parameter type="const-char*" name="etag"/>
+          <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GLocalVfs" parent="GObject" type-name="GLocalVfs">
-      <implements>
-        <interface name="GVfs"/>
-      </implements>
+    <object name="GLocalVfs" type-name="GLocalVfs" get-type="" parent="GVfs">
       <method name="get_type" symbol="g_local_vfs_get_type">
         <return-type type="GType"/>
       </method>
       <constructor name="new" symbol="g_local_vfs_new"/>
     </object>
-    <object get-type="" name="GMemoryInputStream" parent="GInputStream" type-name="GMemoryInputStream">
+    <object name="GMemoryInputStream" type-name="GMemoryInputStream" get-type="" parent="GInputStream">
       <field name="priv" type="GMemoryInputStreamPrivate*"/>
       <implements>
         <interface name="GSeekable"/>
@@ -2679,93 +3411,99 @@
       <method name="from_data" symbol="g_memory_input_stream_from_data">
         <return-type type="GInputStream*"/>
         <parameters>
-          <parameter name="data" type="const-void*"/>
-          <parameter name="len" type="gsize"/>
+          <parameter type="const-void*" name="data"/>
+          <parameter type="gssize" name="len"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_memory_input_stream_get_type">
         <return-type type="GType"/>
       </method>
     </object>
-    <object get-type="" name="GMemoryOutputStream" parent="GOutputStream" type-name="GMemoryOutputStream">
+    <object name="GMemoryOutputStream" type-name="GMemoryOutputStream" get-type="" parent="GOutputStream">
       <field name="priv" type="GMemoryOutputStreamPrivate*"/>
-      <property construct="1" name="data" readable="1" type="gpointer" writable="1"/>
-      <property name="free-array" readable="1" type="gboolean" writable="1"/>
-      <property name="size-limit" readable="1" type="guint" writable="1"/>
+      <property name="data" readable="1" writable="1" construct="1" type="gpointer"/>
+      <property name="free-array" readable="1" writable="1" type="gboolean"/>
+      <property name="size-limit" readable="1" writable="1" type="guint"/>
       <implements>
         <interface name="GSeekable"/>
       </implements>
+      <method name="get_data" symbol="g_memory_output_stream_get_data">
+        <return-type type="GByteArray*"/>
+        <parameters>
+          <parameter type="GMemoryOutputStream*" name="ostream"/>
+        </parameters>
+      </method>
       <method name="get_type" symbol="g_memory_output_stream_get_type">
         <return-type type="GType"/>
       </method>
       <constructor name="new" symbol="g_memory_output_stream_new">
         <parameters>
-          <parameter name="data" type="GByteArray*"/>
+          <parameter type="GByteArray*" name="data"/>
         </parameters>
       </constructor>
       <method name="set_max_size" symbol="g_memory_output_stream_set_max_size">
         <return-type type="void"/>
         <parameters>
-          <parameter name="ostream" type="GMemoryOutputStream*"/>
-          <parameter name="max_size" type="guint"/>
+          <parameter type="GMemoryOutputStream*" name="ostream"/>
+          <parameter type="guint" name="max_size"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GMountOperation" parent="GObject" type-name="GMountOperation">
+    <object name="GMountOperation" type-name="GMountOperation" get-type="" parent="GObject">
       <field name="priv" type="GMountOperationPrivate*"/>
       <signal name="ask_password" when="LAST">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
-          <parameter name="message" type="const-char*"/>
-          <parameter name="default_user" type="const-char*"/>
-          <parameter name="default_domain" type="const-char*"/>
-          <parameter name="flags" type="GPasswordFlags"/>
+          <parameter type="GMountOperation*" name="op"/>
+          <parameter type="const-char*" name="message"/>
+          <parameter type="const-char*" name="default_user"/>
+          <parameter type="const-char*" name="default_domain"/>
+          <parameter type="GPasswordFlags" name="flags"/>
         </parameters>
       </signal>
       <signal name="ask_question" when="LAST">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
-          <parameter name="message" type="const-char*"/>
-          <parameter name="choices" type="const-char*[]"/>
+          <parameter type="GMountOperation*" name="op"/>
+          <parameter type="const-char*" name="message"/>
+          <parameter type="const-char*[]" name="choices"/>
         </parameters>
       </signal>
       <signal name="reply" when="LAST">
         <return-type type="void"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
-          <parameter name="abort" type="gboolean"/>
+          <parameter type="GMountOperation*" name="op"/>
+          <parameter type="gboolean" name="abort"/>
         </parameters>
       </signal>
       <method name="get_anonymous" symbol="g_mount_operation_get_anonymous">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
+          <parameter type="GMountOperation*" name="op"/>
         </parameters>
       </method>
       <method name="get_choice" symbol="g_mount_operation_get_choice">
         <return-type type="int"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
+          <parameter type="GMountOperation*" name="op"/>
         </parameters>
       </method>
       <method name="get_domain" symbol="g_mount_operation_get_domain">
         <return-type type="const-char*"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
+          <parameter type="GMountOperation*" name="op"/>
         </parameters>
       </method>
       <method name="get_password" symbol="g_mount_operation_get_password">
         <return-type type="const-char*"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
+          <parameter type="GMountOperation*" name="op"/>
         </parameters>
       </method>
       <method name="get_password_save" symbol="g_mount_operation_get_password_save">
         <return-type type="GPasswordSave"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
+          <parameter type="GMountOperation*" name="op"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_mount_operation_get_type">
@@ -2774,194 +3512,194 @@
       <method name="get_username" symbol="g_mount_operation_get_username">
         <return-type type="const-char*"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
+          <parameter type="GMountOperation*" name="op"/>
         </parameters>
       </method>
       <constructor name="new" symbol="g_mount_operation_new"/>
       <method name="reply" symbol="g_mount_operation_reply">
         <return-type type="void"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
-          <parameter name="abort" type="gboolean"/>
+          <parameter type="GMountOperation*" name="op"/>
+          <parameter type="gboolean" name="abort"/>
         </parameters>
       </method>
       <method name="set_anonymous" symbol="g_mount_operation_set_anonymous">
         <return-type type="void"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
-          <parameter name="anonymous" type="gboolean"/>
+          <parameter type="GMountOperation*" name="op"/>
+          <parameter type="gboolean" name="anonymous"/>
         </parameters>
       </method>
       <method name="set_choice" symbol="g_mount_operation_set_choice">
         <return-type type="void"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
-          <parameter name="choice" type="int"/>
+          <parameter type="GMountOperation*" name="op"/>
+          <parameter type="int" name="choice"/>
         </parameters>
       </method>
       <method name="set_domain" symbol="g_mount_operation_set_domain">
         <return-type type="void"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
-          <parameter name="domain" type="const-char*"/>
+          <parameter type="GMountOperation*" name="op"/>
+          <parameter type="const-char*" name="domain"/>
         </parameters>
       </method>
       <method name="set_password" symbol="g_mount_operation_set_password">
         <return-type type="void"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
-          <parameter name="password" type="const-char*"/>
+          <parameter type="GMountOperation*" name="op"/>
+          <parameter type="const-char*" name="password"/>
         </parameters>
       </method>
       <method name="set_password_save" symbol="g_mount_operation_set_password_save">
         <return-type type="void"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
-          <parameter name="save" type="GPasswordSave"/>
+          <parameter type="GMountOperation*" name="op"/>
+          <parameter type="GPasswordSave" name="save"/>
         </parameters>
       </method>
       <method name="set_username" symbol="g_mount_operation_set_username">
         <return-type type="void"/>
         <parameters>
-          <parameter name="op" type="GMountOperation*"/>
-          <parameter name="username" type="const-char*"/>
+          <parameter type="GMountOperation*" name="op"/>
+          <parameter type="const-char*" name="username"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GOutputStream" parent="GObject" type-name="GOutputStream">
+    <object name="GOutputStream" type-name="GOutputStream" get-type="" parent="GObject">
       <field name="priv" type="GOutputStreamPrivate*"/>
       <vfunc name="write">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="buffer" type="void*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="const-void*" name="buffer"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="flush">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="close">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="write_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="buffer" type="void*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="const-void*" name="buffer"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="write_finish">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="flush_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="flush_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <vfunc name="close_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
       <vfunc name="close_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
       <method name="close" symbol="g_output_stream_close">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="close_async" symbol="g_output_stream_close_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="close_finish" symbol="g_output_stream_close_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="flush" symbol="g_output_stream_flush">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="flush_async" symbol="g_output_stream_flush_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="flush_finish" symbol="g_output_stream_flush_finish">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_output_stream_get_type">
@@ -2970,102 +3708,112 @@
       <method name="has_pending" symbol="g_output_stream_has_pending">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
+          <parameter type="GOutputStream*" name="stream"/>
         </parameters>
       </method>
       <method name="is_closed" symbol="g_output_stream_is_closed">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
+          <parameter type="GOutputStream*" name="stream"/>
         </parameters>
       </method>
       <method name="set_pending" symbol="g_output_stream_set_pending">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="pending" type="gboolean"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="gboolean" name="pending"/>
         </parameters>
       </method>
       <method name="write" symbol="g_output_stream_write">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="buffer" type="void*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="const-void*" name="buffer"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="write_all" symbol="g_output_stream_write_all">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="buffer" type="void*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="bytes_written" type="gsize*"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="const-void*" name="buffer"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="gsize*" name="bytes_written"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
       <method name="write_async" symbol="g_output_stream_write_async">
         <return-type type="void"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="buffer" type="void*"/>
-          <parameter name="count" type="gsize"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="const-void*" name="buffer"/>
+          <parameter type="gsize" name="count"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
       <method name="write_finish" symbol="g_output_stream_write_finish">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="stream" type="GOutputStream*"/>
-          <parameter name="result" type="GAsyncResult*"/>
-          <parameter name="error" type="GError**"/>
+          <parameter type="GOutputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GSimpleAsyncResult" parent="GObject" type-name="GSimpleAsyncResult">
+    <object name="GPollFileMonitor" type-name="GPollFileMonitor" get-type="" parent="GFileMonitor">
+      <method name="get_type" symbol="g_poll_file_monitor_get_type">
+        <return-type type="GType"/>
+      </method>
+      <constructor name="new" symbol="g_poll_file_monitor_new">
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="GSimpleAsyncResult" type-name="GSimpleAsyncResult" get-type="" parent="GObject">
       <implements>
         <interface name="GAsyncResult"/>
       </implements>
       <method name="complete" symbol="g_simple_async_result_complete">
         <return-type type="void"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
         </parameters>
       </method>
       <method name="complete_in_idle" symbol="g_simple_async_result_complete_in_idle">
         <return-type type="void"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
         </parameters>
       </method>
       <method name="get_op_res_gboolean" symbol="g_simple_async_result_get_op_res_gboolean">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
         </parameters>
       </method>
       <method name="get_op_res_gpointer" symbol="g_simple_async_result_get_op_res_gpointer">
         <return-type type="gpointer"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
         </parameters>
       </method>
       <method name="get_op_res_gssize" symbol="g_simple_async_result_get_op_res_gssize">
         <return-type type="gssize"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
         </parameters>
       </method>
       <method name="get_source_tag" symbol="g_simple_async_result_get_source_tag">
         <return-type type="gpointer"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_simple_async_result_get_type">
@@ -3073,134 +3821,134 @@
       </method>
       <constructor name="new" symbol="g_simple_async_result_new">
         <parameters>
-          <parameter name="source_object" type="GObject*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
-          <parameter name="source_tag" type="gpointer"/>
+          <parameter type="GObject*" name="source_object"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+          <parameter type="gpointer" name="source_tag"/>
         </parameters>
       </constructor>
       <constructor name="new_error" symbol="g_simple_async_result_new_error">
         <parameters>
-          <parameter name="source_object" type="GObject*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
-          <parameter name="domain" type="GQuark"/>
-          <parameter name="code" type="gint"/>
-          <parameter name="format" type="const-gchar*"/>
+          <parameter type="GObject*" name="source_object"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GQuark" name="domain"/>
+          <parameter type="gint" name="code"/>
+          <parameter type="const-char*" name="format"/>
         </parameters>
       </constructor>
       <constructor name="new_from_error" symbol="g_simple_async_result_new_from_error">
         <parameters>
-          <parameter name="source_object" type="GObject*"/>
-          <parameter name="callback" type="GAsyncReadyCallback"/>
-          <parameter name="user_data" type="gpointer"/>
-          <parameter name="error" type="GError*"/>
+          <parameter type="GObject*" name="source_object"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GError*" name="error"/>
         </parameters>
       </constructor>
       <method name="propagate_error" symbol="g_simple_async_result_propagate_error">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
-          <parameter name="dest" type="GError**"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
+          <parameter type="GError**" name="dest"/>
         </parameters>
       </method>
       <method name="run_in_thread" symbol="g_simple_async_result_run_in_thread">
         <return-type type="void"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
-          <parameter name="func" type="GSimpleAsyncThreadFunc"/>
-          <parameter name="io_priority" type="int"/>
-          <parameter name="cancellable" type="GCancellable*"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
+          <parameter type="GSimpleAsyncThreadFunc" name="func"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
         </parameters>
       </method>
       <method name="set_error" symbol="g_simple_async_result_set_error">
         <return-type type="void"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
-          <parameter name="domain" type="GQuark"/>
-          <parameter name="code" type="gint"/>
-          <parameter name="format" type="const-gchar*"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
+          <parameter type="GQuark" name="domain"/>
+          <parameter type="gint" name="code"/>
+          <parameter type="const-char*" name="format"/>
         </parameters>
       </method>
       <method name="set_error_va" symbol="g_simple_async_result_set_error_va">
         <return-type type="void"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
-          <parameter name="domain" type="GQuark"/>
-          <parameter name="code" type="gint"/>
-          <parameter name="format" type="const-gchar*"/>
-          <parameter name="args" type="va_list"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
+          <parameter type="GQuark" name="domain"/>
+          <parameter type="gint" name="code"/>
+          <parameter type="const-char*" name="format"/>
+          <parameter type="va_list" name="args"/>
         </parameters>
       </method>
       <method name="set_from_error" symbol="g_simple_async_result_set_from_error">
         <return-type type="void"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
-          <parameter name="error" type="GError*"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
+          <parameter type="GError*" name="error"/>
         </parameters>
       </method>
       <method name="set_handle_cancellation" symbol="g_simple_async_result_set_handle_cancellation">
         <return-type type="void"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
-          <parameter name="handle_cancellation" type="gboolean"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
+          <parameter type="gboolean" name="handle_cancellation"/>
         </parameters>
       </method>
       <method name="set_op_res_gboolean" symbol="g_simple_async_result_set_op_res_gboolean">
         <return-type type="void"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
-          <parameter name="op_res" type="gboolean"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
+          <parameter type="gboolean" name="op_res"/>
         </parameters>
       </method>
       <method name="set_op_res_gpointer" symbol="g_simple_async_result_set_op_res_gpointer">
         <return-type type="void"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
-          <parameter name="op_res" type="gpointer"/>
-          <parameter name="destroy_op_res" type="GDestroyNotify"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
+          <parameter type="gpointer" name="op_res"/>
+          <parameter type="GDestroyNotify" name="destroy_op_res"/>
         </parameters>
       </method>
       <method name="set_op_res_gssize" symbol="g_simple_async_result_set_op_res_gssize">
         <return-type type="void"/>
         <parameters>
-          <parameter name="simple" type="GSimpleAsyncResult*"/>
-          <parameter name="op_res" type="gssize"/>
+          <parameter type="GSimpleAsyncResult*" name="simple"/>
+          <parameter type="gssize" name="op_res"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GSocketInputStream" parent="GInputStream" type-name="GSocketInputStream">
+    <object name="GSocketInputStream" type-name="GSocketInputStream" get-type="" parent="GInputStream">
       <field name="priv" type="GSocketInputStreamPrivate*"/>
       <method name="get_type" symbol="g_socket_input_stream_get_type">
         <return-type type="GType"/>
       </method>
       <constructor name="new" symbol="g_socket_input_stream_new">
         <parameters>
-          <parameter name="fd" type="int"/>
-          <parameter name="close_fd_at_close" type="gboolean"/>
+          <parameter type="int" name="fd"/>
+          <parameter type="gboolean" name="close_fd_at_close"/>
         </parameters>
       </constructor>
     </object>
-    <object get-type="" name="GSocketOutputStream" parent="GOutputStream" type-name="GSocketOutputStream">
+    <object name="GSocketOutputStream" type-name="GSocketOutputStream" get-type="" parent="GOutputStream">
       <field name="priv" type="GSocketOutputStreamPrivate*"/>
       <method name="get_type" symbol="g_socket_output_stream_get_type">
         <return-type type="GType"/>
       </method>
       <constructor name="new" symbol="g_socket_output_stream_new">
         <parameters>
-          <parameter name="fd" type="int"/>
-          <parameter name="close_fd_at_close" type="gboolean"/>
+          <parameter type="int" name="fd"/>
+          <parameter type="gboolean" name="close_fd_at_close"/>
         </parameters>
       </constructor>
     </object>
-    <object get-type="" name="GThemedIcon" parent="GObject" type-name="GThemedIcon">
+    <object name="GThemedIcon" type-name="GThemedIcon" get-type="" parent="GObject">
       <implements>
         <interface name="GIcon"/>
       </implements>
       <method name="get_names" symbol="g_themed_icon_get_names">
         <return-type type="char**"/>
         <parameters>
-          <parameter name="icon" type="GThemedIcon*"/>
+          <parameter type="GThemedIcon*" name="icon"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_themed_icon_get_type">
@@ -3208,24 +3956,25 @@
       </method>
       <constructor name="new" symbol="g_themed_icon_new">
         <parameters>
-          <parameter name="iconname" type="const-char*"/>
+          <parameter type="const-char*" name="iconname"/>
         </parameters>
       </constructor>
       <constructor name="new_from_names" symbol="g_themed_icon_new_from_names">
         <parameters>
-          <parameter name="iconnames" type="char**"/>
+          <parameter type="char**" name="iconnames"/>
+          <parameter type="int" name="len"/>
         </parameters>
       </constructor>
     </object>
-    <object get-type="" name="GUnionDrive" parent="GObject" type-name="GUnionDrive">
+    <object name="GUnionDrive" type-name="GUnionDrive" get-type="" parent="GObject">
       <implements>
         <interface name="GDrive"/>
       </implements>
       <method name="child_is_for_monitor" symbol="g_union_drive_child_is_for_monitor">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="union_drive" type="GUnionDrive*"/>
-          <parameter name="child_monitor" type="GVolumeMonitor*"/>
+          <parameter type="GUnionDrive*" name="union_drive"/>
+          <parameter type="GVolumeMonitor*" name="child_monitor"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_union_drive_get_type">
@@ -3234,35 +3983,35 @@
       <method name="is_for_child_drive" symbol="g_union_drive_is_for_child_drive">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="union_drive" type="GUnionDrive*"/>
-          <parameter name="child_drive" type="GDrive*"/>
+          <parameter type="GUnionDrive*" name="union_drive"/>
+          <parameter type="GDrive*" name="child_drive"/>
         </parameters>
       </method>
       <constructor name="new" symbol="g_union_drive_new">
         <parameters>
-          <parameter name="union_monitor" type="GVolumeMonitor*"/>
-          <parameter name="child_drive" type="GDrive*"/>
-          <parameter name="child_monitor" type="GVolumeMonitor*"/>
+          <parameter type="GVolumeMonitor*" name="union_monitor"/>
+          <parameter type="GDrive*" name="child_drive"/>
+          <parameter type="GVolumeMonitor*" name="child_monitor"/>
         </parameters>
       </constructor>
     </object>
-    <object get-type="" name="GUnionVolume" parent="GObject" type-name="GUnionVolume">
+    <object name="GUnionVolume" type-name="GUnionVolume" get-type="" parent="GObject">
       <implements>
         <interface name="GVolume"/>
       </implements>
       <method name="add_volume" symbol="g_union_volume_add_volume">
         <return-type type="void"/>
         <parameters>
-          <parameter name="union_volume" type="GUnionVolume*"/>
-          <parameter name="volume" type="GVolume*"/>
-          <parameter name="monitor" type="GVolumeMonitor*"/>
+          <parameter type="GUnionVolume*" name="union_volume"/>
+          <parameter type="GVolume*" name="volume"/>
+          <parameter type="GVolumeMonitor*" name="monitor"/>
         </parameters>
       </method>
       <method name="get_child_for_monitor" symbol="g_union_volume_get_child_for_monitor">
         <return-type type="GVolume*"/>
         <parameters>
-          <parameter name="union_volume" type="GUnionVolume*"/>
-          <parameter name="child_monitor" type="GVolumeMonitor*"/>
+          <parameter type="GUnionVolume*" name="union_volume"/>
+          <parameter type="GVolumeMonitor*" name="child_monitor"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_union_volume_get_type">
@@ -3271,59 +4020,59 @@
       <method name="has_child_volume" symbol="g_union_volume_has_child_volume">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="union_volume" type="GUnionVolume*"/>
-          <parameter name="child_volume" type="GVolume*"/>
+          <parameter type="GUnionVolume*" name="union_volume"/>
+          <parameter type="GVolume*" name="child_volume"/>
         </parameters>
       </method>
       <method name="is_last_child" symbol="g_union_volume_is_last_child">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="union_volume" type="GUnionVolume*"/>
-          <parameter name="child_volume" type="GVolume*"/>
+          <parameter type="GUnionVolume*" name="union_volume"/>
+          <parameter type="GVolume*" name="child_volume"/>
         </parameters>
       </method>
       <constructor name="new" symbol="g_union_volume_new">
         <parameters>
-          <parameter name="union_monitor" type="GVolumeMonitor*"/>
-          <parameter name="volume" type="GVolume*"/>
-          <parameter name="monitor" type="GVolumeMonitor*"/>
+          <parameter type="GVolumeMonitor*" name="union_monitor"/>
+          <parameter type="GVolume*" name="volume"/>
+          <parameter type="GVolumeMonitor*" name="monitor"/>
         </parameters>
       </constructor>
       <method name="remove_volume" symbol="g_union_volume_remove_volume">
         <return-type type="void"/>
         <parameters>
-          <parameter name="union_volume" type="GUnionVolume*"/>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GUnionVolume*" name="union_volume"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GUnionVolumeMonitor" parent="GVolumeMonitor" type-name="GUnionVolumeMonitor">
+    <object name="GUnionVolumeMonitor" type-name="GUnionVolumeMonitor" get-type="" parent="GVolumeMonitor">
       <method name="convert_drive" symbol="g_union_volume_monitor_convert_drive">
         <return-type type="GDrive*"/>
         <parameters>
-          <parameter name="monitor" type="GUnionVolumeMonitor*"/>
-          <parameter name="child_drive" type="GDrive*"/>
+          <parameter type="GUnionVolumeMonitor*" name="monitor"/>
+          <parameter type="GDrive*" name="child_drive"/>
         </parameters>
       </method>
       <method name="convert_volumes" symbol="g_union_volume_monitor_convert_volumes">
         <return-type type="GList*"/>
         <parameters>
-          <parameter name="monitor" type="GUnionVolumeMonitor*"/>
-          <parameter name="child_volumes" type="GList*"/>
+          <parameter type="GUnionVolumeMonitor*" name="monitor"/>
+          <parameter type="GList*" name="child_volumes"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_union_volume_monitor_get_type">
         <return-type type="GType"/>
       </method>
     </object>
-    <object get-type="" name="GUnixDrive" parent="GObject" type-name="GUnixDrive">
+    <object name="GUnixDrive" type-name="GUnixDrive" get-type="" parent="GObject">
       <implements>
         <interface name="GDrive"/>
       </implements>
       <method name="disconnected" symbol="g_unix_drive_disconnected">
         <return-type type="void"/>
         <parameters>
-          <parameter name="drive" type="GUnixDrive*"/>
+          <parameter type="GUnixDrive*" name="drive"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_unix_drive_get_type">
@@ -3332,32 +4081,32 @@
       <method name="has_mountpoint" symbol="g_unix_drive_has_mountpoint">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="drive" type="GUnixDrive*"/>
-          <parameter name="mountpoint" type="const-char*"/>
+          <parameter type="GUnixDrive*" name="drive"/>
+          <parameter type="const-char*" name="mountpoint"/>
         </parameters>
       </method>
       <constructor name="new" symbol="g_unix_drive_new">
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
-          <parameter name="mountpoint" type="GUnixMountPoint*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
+          <parameter type="GUnixMountPoint*" name="mountpoint"/>
         </parameters>
       </constructor>
       <method name="set_volume" symbol="g_unix_drive_set_volume">
         <return-type type="void"/>
         <parameters>
-          <parameter name="drive" type="GUnixDrive*"/>
-          <parameter name="volume" type="GUnixVolume*"/>
+          <parameter type="GUnixDrive*" name="drive"/>
+          <parameter type="GUnixVolume*" name="volume"/>
         </parameters>
       </method>
       <method name="unset_volume" symbol="g_unix_drive_unset_volume">
         <return-type type="void"/>
         <parameters>
-          <parameter name="drive" type="GUnixDrive*"/>
-          <parameter name="volume" type="GUnixVolume*"/>
+          <parameter type="GUnixDrive*" name="drive"/>
+          <parameter type="GUnixVolume*" name="volume"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GUnixVolume" parent="GObject" type-name="GUnixVolume">
+    <object name="GUnixVolume" type-name="GUnixVolume" get-type="" parent="GObject">
       <implements>
         <interface name="GVolume"/>
       </implements>
@@ -3367,109 +4116,183 @@
       <method name="has_mountpoint" symbol="g_unix_volume_has_mountpoint">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="volume" type="GUnixVolume*"/>
-          <parameter name="mountpoint" type="const-char*"/>
+          <parameter type="GUnixVolume*" name="volume"/>
+          <parameter type="const-char*" name="mountpoint"/>
         </parameters>
       </method>
       <constructor name="new" symbol="g_unix_volume_new">
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
-          <parameter name="mount" type="GUnixMount*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
+          <parameter type="GUnixMount*" name="mount"/>
         </parameters>
       </constructor>
       <method name="unmounted" symbol="g_unix_volume_unmounted">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume" type="GUnixVolume*"/>
+          <parameter type="GUnixVolume*" name="volume"/>
         </parameters>
       </method>
       <method name="unset_drive" symbol="g_unix_volume_unset_drive">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume" type="GUnixVolume*"/>
-          <parameter name="drive" type="GUnixDrive*"/>
+          <parameter type="GUnixVolume*" name="volume"/>
+          <parameter type="GUnixDrive*" name="drive"/>
         </parameters>
       </method>
     </object>
-    <object get-type="" name="GUnixVolumeMonitor" parent="GVolumeMonitor" type-name="GUnixVolumeMonitor">
+    <object name="GUnixVolumeMonitor" type-name="GUnixVolumeMonitor" get-type="" parent="GVolumeMonitor">
       <method name="get_type" symbol="g_unix_volume_monitor_get_type">
         <return-type type="GType"/>
       </method>
       <method name="lookup_drive_for_mountpoint" symbol="g_unix_volume_monitor_lookup_drive_for_mountpoint">
         <return-type type="GUnixDrive*"/>
         <parameters>
-          <parameter name="monitor" type="GUnixVolumeMonitor*"/>
-          <parameter name="mountpoint" type="const-char*"/>
+          <parameter type="GUnixVolumeMonitor*" name="monitor"/>
+          <parameter type="const-char*" name="mountpoint"/>
         </parameters>
       </method>
       <constructor name="new" symbol="g_unix_volume_monitor_new"/>
     </object>
-    <object get-type="" name="GVolumeMonitor" parent="GObject" type-name="GVolumeMonitor">
+    <object name="GVfs" type-name="GVfs" get-type="" parent="GObject">
+      <vfunc name="get_priority">
+        <return-type type="int"/>
+        <parameters>
+          <parameter type="GVfs*" name="vfs"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="get_file_for_path">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="GVfs*" name="vfs"/>
+          <parameter type="const-char*" name="path"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="get_file_for_uri">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="GVfs*" name="vfs"/>
+          <parameter type="const-char*" name="uri"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="parse_name">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="GVfs*" name="vfs"/>
+          <parameter type="const-char*" name="parse_name"/>
+        </parameters>
+      </vfunc>
+      <method name="get_default" symbol="g_vfs_get_default">
+        <return-type type="GVfs*"/>
+      </method>
+      <method name="get_file_for_path" symbol="g_vfs_get_file_for_path">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="GVfs*" name="vfs"/>
+          <parameter type="const-char*" name="path"/>
+        </parameters>
+      </method>
+      <method name="get_file_for_uri" symbol="g_vfs_get_file_for_uri">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="GVfs*" name="vfs"/>
+          <parameter type="const-char*" name="uri"/>
+        </parameters>
+      </method>
+      <method name="get_local" symbol="g_vfs_get_local">
+        <return-type type="GVfs*"/>
+      </method>
+      <method name="get_name" symbol="g_vfs_get_name">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GVfs*" name="vfs"/>
+        </parameters>
+      </method>
+      <method name="get_priority" symbol="g_vfs_get_priority">
+        <return-type type="int"/>
+        <parameters>
+          <parameter type="GVfs*" name="vfs"/>
+        </parameters>
+      </method>
+      <method name="get_type" symbol="g_vfs_get_type">
+        <return-type type="GType"/>
+      </method>
+      <method name="parse_name" symbol="g_vfs_parse_name">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="GVfs*" name="vfs"/>
+          <parameter type="const-char*" name="parse_name"/>
+        </parameters>
+      </method>
+    </object>
+    <object name="GVolumeMonitor" type-name="GVolumeMonitor" get-type="" parent="GObject">
       <field name="priv" type="gpointer"/>
       <signal name="volume_mounted" when="LAST">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </signal>
       <signal name="volume_pre_unmount" when="LAST">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </signal>
       <signal name="volume_unmounted" when="LAST">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
-          <parameter name="volume" type="GVolume*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
+          <parameter type="GVolume*" name="volume"/>
         </parameters>
       </signal>
       <signal name="drive_connected" when="LAST">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </signal>
       <signal name="drive_disconnected" when="LAST">
         <return-type type="void"/>
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
-          <parameter name="drive" type="GDrive*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
+          <parameter type="GDrive*" name="drive"/>
         </parameters>
       </signal>
       <vfunc name="get_mounted_volumes">
         <return-type type="GList*"/>
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
         </parameters>
       </vfunc>
       <vfunc name="get_connected_drives">
         <return-type type="GList*"/>
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
         </parameters>
       </vfunc>
+      <method name="get" symbol="g_volume_monitor_get">
+        <return-type type="GVolumeMonitor*"/>
+      </method>
       <method name="get_connected_drives" symbol="g_volume_monitor_get_connected_drives">
         <return-type type="GList*"/>
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
         </parameters>
       </method>
       <method name="get_mounted_volumes" symbol="g_volume_monitor_get_mounted_volumes">
         <return-type type="GList*"/>
         <parameters>
-          <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+          <parameter type="GVolumeMonitor*" name="volume_monitor"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_volume_monitor_get_type">
         <return-type type="GType"/>
       </method>
     </object>
-    <object get-type="" name="GWin32AppInfo" parent="GObject" type-name="GWin32AppInfo">
+    <object name="GWin32AppInfo" type-name="GWin32AppInfo" get-type="" parent="GObject">
       <implements>
         <interface name="GAppInfo"/>
       </implements>
@@ -3477,83 +4300,286 @@
         <return-type type="GType"/>
       </method>
     </object>
-    <struct get-type="" name="GAsyncResultData" type-name="GAsyncResultData">
-      <field name="async_object" readable="1" type="gpointer" writable="1"/>
-      <field name="error" readable="1" type="GError*" writable="1"/>
-      <field name="user_data" readable="1" type="gpointer" writable="1"/>
+    <struct name="GAsyncResultData" type-name="GAsyncResultData" get-type="">
+      <field name="async_object" type="gpointer" readable="1" writable="1"/>
+      <field name="error" type="GError*" readable="1" writable="1"/>
+      <field name="user_data" type="gpointer" readable="1" writable="1"/>
     </struct>
-    <struct get-type="" name="GFileAttributeMatcher" opaque="true" type-name="GFileAttributeMatcher">
-      <method name="enumerate_namespace" symbol="g_file_attribute_matcher_enumerate_namespace">
-        <return-type type="gboolean"/>
+    <struct name="GFileAttributeInfo" type-name="GFileAttributeInfo" get-type="">
+      <field name="name" type="char*" readable="1" writable="1"/>
+      <field name="type" type="GFileAttributeType" readable="1" writable="1"/>
+      <field name="flags" type="GFileAttributeFlags" readable="1" writable="1"/>
+    </struct>
+    <struct name="GFileAttributeInfoList" type-name="GFileAttributeInfoList" get-type="" opaque="true">
+      <field name="infos" type="GFileAttributeInfo*" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="n_infos" type="int" readable="1" writable="1" access="public" writeable="true"/>
+      <method name="add" symbol="g_file_attribute_info_list_add">
+        <return-type type="void"/>
         <parameters>
-          <parameter name="matcher" type="GFileAttributeMatcher*"/>
-          <parameter name="namespace" type="const-char*"/>
+          <parameter type="GFileAttributeInfoList*" name="list"/>
+          <parameter type="const-char*" name="name"/>
+          <parameter type="GFileAttributeType" name="type"/>
+          <parameter type="GFileAttributeFlags" name="flags"/>
         </parameters>
       </method>
-      <method name="enumerate_next" symbol="g_file_attribute_matcher_enumerate_next">
-        <return-type type="const-char*"/>
+      <method name="dup" symbol="g_file_attribute_info_list_dup">
+        <return-type type="GFileAttributeInfoList*"/>
+        <parameters>
+          <parameter type="GFileAttributeInfoList*" name="list"/>
+        </parameters>
+      </method>
+      <method name="lookup" symbol="g_file_attribute_info_list_lookup">
+        <return-type type="const-GFileAttributeInfo*"/>
+        <parameters>
+          <parameter type="GFileAttributeInfoList*" name="list"/>
+          <parameter type="const-char*" name="name"/>
+        </parameters>
+      </method>
+      <method name="new" symbol="g_file_attribute_info_list_new">
+        <return-type type="GFileAttributeInfoList*"/>
+      </method>
+      <method name="ref" symbol="g_file_attribute_info_list_ref">
+        <return-type type="GFileAttributeInfoList*"/>
         <parameters>
-          <parameter name="matcher" type="GFileAttributeMatcher*"/>
+          <parameter type="GFileAttributeInfoList*" name="list"/>
         </parameters>
       </method>
-      <method name="free" symbol="g_file_attribute_matcher_free">
+      <method name="unref" symbol="g_file_attribute_info_list_unref">
         <return-type type="void"/>
         <parameters>
-          <parameter name="matcher" type="GFileAttributeMatcher*"/>
+          <parameter type="GFileAttributeInfoList*" name="list"/>
+        </parameters>
+      </method>
+    </struct>
+    <struct name="GFileAttributeMatcher" type-name="GFileAttributeMatcher" get-type="" opaque="true">
+      <method name="enumerate_namespace" symbol="g_file_attribute_matcher_enumerate_namespace">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileAttributeMatcher*" name="matcher"/>
+          <parameter type="const-char*" name="namespace"/>
+        </parameters>
+      </method>
+      <method name="enumerate_next" symbol="g_file_attribute_matcher_enumerate_next">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GFileAttributeMatcher*" name="matcher"/>
         </parameters>
       </method>
       <method name="matches" symbol="g_file_attribute_matcher_matches">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="matcher" type="GFileAttributeMatcher*"/>
-          <parameter name="full_name" type="const-char*"/>
+          <parameter type="GFileAttributeMatcher*" name="matcher"/>
+          <parameter type="const-char*" name="full_name"/>
         </parameters>
       </method>
       <method name="matches_only" symbol="g_file_attribute_matcher_matches_only">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="matcher" type="GFileAttributeMatcher*"/>
-          <parameter name="full_name" type="const-char*"/>
+          <parameter type="GFileAttributeMatcher*" name="matcher"/>
+          <parameter type="const-char*" name="full_name"/>
         </parameters>
       </method>
       <method name="new" symbol="g_file_attribute_matcher_new">
         <return-type type="GFileAttributeMatcher*"/>
         <parameters>
-          <parameter name="attributes" type="const-char*"/>
+          <parameter type="const-char*" name="attributes"/>
+        </parameters>
+      </method>
+      <method name="ref" symbol="g_file_attribute_matcher_ref">
+        <return-type type="GFileAttributeMatcher*"/>
+        <parameters>
+          <parameter type="GFileAttributeMatcher*" name="matcher"/>
+        </parameters>
+      </method>
+      <method name="unref" symbol="g_file_attribute_matcher_unref">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeMatcher*" name="matcher"/>
+        </parameters>
+      </method>
+    </struct>
+    <struct name="GFileAttributeValue" type-name="GFileAttributeValue" get-type="" opaque="true">
+      <field name="type" type="GFileAttributeType" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="status" type="GFileAttributeStatus" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="boolean" type="gboolean" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="int32" type="gint32" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="uint32" type="guint32" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="int64" type="gint64" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="uint64" type="guint64" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="string" type="char*" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="quark" type="GQuark" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="obj" type="GObject*" readable="1" writable="1" access="public" writeable="true"/>
+      <field name="u" type="}" readable="1" writable="1" access="public" writeable="true"/>
+      <method name="as_string" symbol="g_file_attribute_value_as_string">
+        <return-type type="char*"/>
+        <parameters>
+          <parameter type="const-GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="clear" symbol="g_file_attribute_value_clear">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="dup" symbol="g_file_attribute_value_dup">
+        <return-type type="GFileAttributeValue*"/>
+        <parameters>
+          <parameter type="const-GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="free" symbol="g_file_attribute_value_free">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="get_boolean" symbol="g_file_attribute_value_get_boolean">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="const-GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="get_byte_string" symbol="g_file_attribute_value_get_byte_string">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="const-GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="get_int32" symbol="g_file_attribute_value_get_int32">
+        <return-type type="gint32"/>
+        <parameters>
+          <parameter type="const-GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="get_int64" symbol="g_file_attribute_value_get_int64">
+        <return-type type="gint64"/>
+        <parameters>
+          <parameter type="const-GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="get_object" symbol="g_file_attribute_value_get_object">
+        <return-type type="GObject*"/>
+        <parameters>
+          <parameter type="const-GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="get_string" symbol="g_file_attribute_value_get_string">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="const-GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="get_uint32" symbol="g_file_attribute_value_get_uint32">
+        <return-type type="guint32"/>
+        <parameters>
+          <parameter type="const-GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="get_uint64" symbol="g_file_attribute_value_get_uint64">
+        <return-type type="guint64"/>
+        <parameters>
+          <parameter type="const-GFileAttributeValue*" name="attr"/>
+        </parameters>
+      </method>
+      <method name="new" symbol="g_file_attribute_value_new">
+        <return-type type="GFileAttributeValue*"/>
+      </method>
+      <method name="set" symbol="g_file_attribute_value_set">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+          <parameter type="const-GFileAttributeValue*" name="new_value"/>
+        </parameters>
+      </method>
+      <method name="set_boolean" symbol="g_file_attribute_value_set_boolean">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+          <parameter type="gboolean" name="value"/>
+        </parameters>
+      </method>
+      <method name="set_byte_string" symbol="g_file_attribute_value_set_byte_string">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+          <parameter type="const-char*" name="value"/>
+        </parameters>
+      </method>
+      <method name="set_int32" symbol="g_file_attribute_value_set_int32">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+          <parameter type="gint32" name="value"/>
+        </parameters>
+      </method>
+      <method name="set_int64" symbol="g_file_attribute_value_set_int64">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+          <parameter type="gint64" name="value"/>
+        </parameters>
+      </method>
+      <method name="set_object" symbol="g_file_attribute_value_set_object">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+          <parameter type="GObject*" name="obj"/>
+        </parameters>
+      </method>
+      <method name="set_string" symbol="g_file_attribute_value_set_string">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+          <parameter type="const-char*" name="value"/>
+        </parameters>
+      </method>
+      <method name="set_uint32" symbol="g_file_attribute_value_set_uint32">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+          <parameter type="guint32" name="value"/>
+        </parameters>
+      </method>
+      <method name="set_uint64" symbol="g_file_attribute_value_set_uint64">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileAttributeValue*" name="attr"/>
+          <parameter type="guint64" name="value"/>
         </parameters>
       </method>
     </struct>
-    <struct get-type="" name="GIOJob" opaque="true" type-name="GIOJob">
+    <struct name="GIOJob" type-name="GIOJob" get-type="" opaque="true">
       <method name="send_to_mainloop" symbol="g_io_job_send_to_mainloop">
         <return-type type="void"/>
         <parameters>
-          <parameter name="job" type="GIOJob*"/>
-          <parameter name="func" type="GIODataFunc"/>
-          <parameter name="user_data" type="gpointer"/>
-          <parameter name="notify" type="GDestroyNotify"/>
-          <parameter name="block" type="gboolean"/>
+          <parameter type="GIOJob*" name="job"/>
+          <parameter type="GIODataFunc" name="func"/>
+          <parameter type="gpointer" name="user_data"/>
+          <parameter type="GDestroyNotify" name="notify"/>
+          <parameter type="gboolean" name="block"/>
         </parameters>
       </method>
     </struct>
-    <struct get-type="" name="GLocalParentFileInfo" type-name="GLocalParentFileInfo">
-      <field name="writable" readable="1" type="gboolean" writable="1"/>
-      <field name="is_sticky" readable="1" type="gboolean" writable="1"/>
-      <field name="owner" readable="1" type="int" writable="1"/>
+    <struct name="GLocalParentFileInfo" type-name="GLocalParentFileInfo" get-type="">
+      <field name="writable" type="gboolean" readable="1" writable="1"/>
+      <field name="is_sticky" type="gboolean" readable="1" writable="1"/>
+      <field name="owner" type="int" readable="1" writable="1"/>
     </struct>
-    <struct get-type="" name="GUnixMount" type-name="GUnixMount">
-      <field name="mount_path" readable="1" type="char*" writable="1"/>
-      <field name="device_path" readable="1" type="char*" writable="1"/>
-      <field name="filesystem_type" readable="1" type="char*" writable="1"/>
-      <field name="is_read_only" readable="1" type="gboolean" writable="1"/>
+    <struct name="GUnixMount" type-name="GUnixMount" get-type="">
+      <field name="mount_path" type="char*" readable="1" writable="1"/>
+      <field name="device_path" type="char*" readable="1" writable="1"/>
+      <field name="filesystem_type" type="char*" readable="1" writable="1"/>
+      <field name="is_read_only" type="gboolean" readable="1" writable="1"/>
     </struct>
-    <struct get-type="" name="GUnixMountPoint" type-name="GUnixMountPoint">
-      <field name="mount_path" readable="1" type="char*" writable="1"/>
-      <field name="device_path" readable="1" type="char*" writable="1"/>
-      <field name="filesystem_type" readable="1" type="char*" writable="1"/>
-      <field name="dev_opt" readable="1" type="char*" writable="1"/>
-      <field name="is_read_only" readable="1" type="gboolean" writable="1"/>
-      <field name="is_user_mountable" readable="1" type="gboolean" writable="1"/>
-      <field name="is_loopback" readable="1" type="gboolean" writable="1"/>
+    <struct name="GUnixMountPoint" type-name="GUnixMountPoint" get-type="">
+      <field name="mount_path" type="char*" readable="1" writable="1"/>
+      <field name="device_path" type="char*" readable="1" writable="1"/>
+      <field name="filesystem_type" type="char*" readable="1" writable="1"/>
+      <field name="dev_opt" type="char*" readable="1" writable="1"/>
+      <field name="is_read_only" type="gboolean" readable="1" writable="1"/>
+      <field name="is_user_mountable" type="gboolean" readable="1" writable="1"/>
+      <field name="is_loopback" type="gboolean" readable="1" writable="1"/>
     </struct>
   </namespace>
 </api>