update to glib 2.15.0
authorJuerg Billeter <j@bitron.ch>
Mon, 24 Dec 2007 12:40:43 +0000 (12:40 +0000)
committerJürg Billeter <juergbi@src.gnome.org>
Mon, 24 Dec 2007 12:40:43 +0000 (12:40 +0000)
2007-12-24  Juerg Billeter  <j@bitron.ch>

* vapi/gio-2.0.vapi, vapi/packages/gio-2.0/: update to glib 2.15.0

svn path=/trunk/; revision=786

ChangeLog
vapi/gio-2.0.vapi
vapi/packages/gio-2.0/gio-2.0.defines [new file with mode: 0644]
vapi/packages/gio-2.0/gio-2.0.files
vapi/packages/gio-2.0/gio-2.0.gi
vapi/packages/gio-2.0/gio-2.0.metadata

index 6617526..72b522d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-24  Jürg Billeter  <j@bitron.ch>
 
+       * vapi/gio-2.0.vapi, vapi/packages/gio-2.0/: update to glib 2.15.0
+
+2007-12-24  Jürg Billeter  <j@bitron.ch>
+
        * vala/valasignal.vala: fix interface signals
 
 2007-12-22  Jürg Billeter  <j@bitron.ch>
index 7860a44..6bf7d9c 100644 (file)
@@ -2,37 +2,26 @@
 
 [CCode (cprefix = "G", lower_case_cprefix = "g_")]
 namespace GLib {
-       [CCode (cprefix = "G_APP_INFO_CREATE_", cheader_filename = "gio/gvfs.h")]
-       public enum AppInfoCreateFlags {
-               FLAGS_NONE,
-               NEEDS_TERMINAL,
-       }
-       [CCode (cprefix = "G_DATA_STREAM_BYTE_ORDER_", cheader_filename = "gio/gvfs.h")]
+       [CCode (cprefix = "G_DATA_STREAM_BYTE_ORDER_", cheader_filename = "gio/gio.h")]
        public enum DataStreamByteOrder {
                BIG_ENDIAN,
                LITTLE_ENDIAN,
                HOST_ENDIAN,
        }
-       [CCode (cprefix = "G_DATA_STREAM_NEWLINE_TYPE_", cheader_filename = "gio/gvfs.h")]
+       [CCode (cprefix = "G_DATA_STREAM_NEWLINE_TYPE_", cheader_filename = "gio/gio.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")]
+       [CCode (cprefix = "G_FILE_ATTRIBUTE_STATUS_", cheader_filename = "gio/gio.h")]
        public enum FileAttributeStatus {
                UNSET,
                SET,
                ERROR_SETTING,
        }
-       [CCode (cprefix = "G_FILE_ATTRIBUTE_TYPE_", cheader_filename = "gio/gvfs.h")]
+       [CCode (cprefix = "G_FILE_ATTRIBUTE_TYPE_", cheader_filename = "gio/gio.h")]
        public enum FileAttributeType {
                INVALID,
                STRING,
@@ -44,19 +33,7 @@ namespace GLib {
                INT64,
                OBJECT,
        }
-       [CCode (cprefix = "G_FILE_COPY_", cheader_filename = "gio/gvfs.h")]
-       public enum FileCopyFlags {
-               OVERWRITE,
-               BACKUP,
-               NOFOLLOW_SYMLINKS,
-               ALL_METADATA,
-       }
-       [CCode (cprefix = "G_FILE_CREATE_FLAGS_", cheader_filename = "gio/gvfs.h")]
-       public enum FileCreateFlags {
-               NONE,
-               PRIVATE,
-       }
-       [CCode (cprefix = "G_FILE_MONITOR_EVENT_", cheader_filename = "gio/gvfs.h")]
+       [CCode (cprefix = "G_FILE_MONITOR_EVENT_", cheader_filename = "gio/gio.h")]
        public enum FileMonitorEvent {
                CHANGED,
                CHANGES_DONE_HINT,
@@ -66,16 +43,7 @@ namespace GLib {
                PRE_UNMOUNT,
                UNMOUNTED,
        }
-       [CCode (cprefix = "G_FILE_MONITOR_FLAGS_", cheader_filename = "gio/gvfs.h")]
-       public enum FileMonitorFlags {
-               NONE,
-               MONITOR_MOUNTS,
-       }
-       [CCode (cprefix = "G_FILE_QUERY_INFO_NOFOLLOW_", cheader_filename = "gio/gvfs.h")]
-       public enum FileQueryInfoFlags {
-               SYMLINKS,
-       }
-       [CCode (cprefix = "G_FILE_TYPE_", cheader_filename = "gio/gvfs.h")]
+       [CCode (cprefix = "G_FILE_TYPE_", cheader_filename = "gio/gio.h")]
        public enum FileType {
                UNKNOWN,
                REGULAR,
@@ -85,7 +53,7 @@ namespace GLib {
                SHORTCUT,
                MOUNTABLE,
        }
-       [CCode (cprefix = "G_IO_ERROR_", cheader_filename = "gio/gvfs.h")]
+       [CCode (cprefix = "G_IO_ERROR_", cheader_filename = "gio/gio.h")]
        public enum IOErrorEnum {
                FAILED,
                NOT_FOUND,
@@ -116,43 +84,94 @@ namespace GLib {
                BUSY,
                WOULD_BLOCK,
                HOST_NOT_FOUND,
+               WOULD_MERGE,
+               FAILED_HANDLED,
        }
-       [CCode (cprefix = "G_OUTPUT_STREAM_SPLICE_FLAGS_", cheader_filename = "gio/gvfs.h")]
-       public enum OutputStreamSpliceFlags {
+       [CCode (cprefix = "G_PASSWORD_SAVE_", cheader_filename = "gio/gio.h")]
+       public enum PasswordSave {
+               NEVER,
+               FOR_SESSION,
+               PERMANENTLY,
+       }
+       [CCode (cprefix = "G_APP_INFO_CREATE_", cheader_filename = "gio/gio.h")]
+       [Flags]
+       public enum AppInfoCreateFlags {
                NONE,
-               CLOSE_SOURCE,
-               CLOSE_TARGET,
+               NEEDS_TERMINAL,
        }
-       [CCode (cprefix = "G_PASSWORD_FLAGS_", cheader_filename = "gio/gvfs.h")]
-       public enum PasswordFlags {
+       [CCode (cprefix = "G_ASK_PASSWORD_", cheader_filename = "gio/gio.h")]
+       [Flags]
+       public enum AskPasswordFlags {
                NEED_PASSWORD,
                NEED_USERNAME,
                NEED_DOMAIN,
                SAVING_SUPPORTED,
-               ANON_SUPPORTED,
+               ANONYMOUS_SUPPORTED,
        }
-       [CCode (cprefix = "G_PASSWORD_SAVE_", cheader_filename = "gio/gvfs.h")]
-       public enum PasswordSave {
-               NEVER,
-               FOR_SESSION,
-               PERMANENTLY,
+       [CCode (cprefix = "G_FILE_ATTRIBUTE_INFO_", cheader_filename = "gio/gio.h")]
+       [Flags]
+       public enum FileAttributeInfoFlags {
+               NONE,
+               COPY_WITH_FILE,
+               COPY_WHEN_MOVED,
+       }
+       [CCode (cprefix = "G_FILE_COPY_", cheader_filename = "gio/gio.h")]
+       [Flags]
+       public enum FileCopyFlags {
+               NONE,
+               OVERWRITE,
+               BACKUP,
+               NOFOLLOW_SYMLINKS,
+               ALL_METADATA,
+               NO_FALLBACK_FOR_MOVE,
+       }
+       [CCode (cprefix = "G_FILE_CREATE_", cheader_filename = "gio/gio.h")]
+       [Flags]
+       public enum FileCreateFlags {
+               NONE,
+               PRIVATE,
+       }
+       [CCode (cprefix = "G_FILE_MONITOR_", cheader_filename = "gio/gio.h")]
+       [Flags]
+       public enum FileMonitorFlags {
+               NONE,
+               WATCH_MOUNTS,
+       }
+       [CCode (cprefix = "G_FILE_QUERY_INFO_", cheader_filename = "gio/gio.h")]
+       [Flags]
+       public enum FileQueryInfoFlags {
+               NONE,
+               NOFOLLOW_SYMLINKS,
+       }
+       [CCode (cprefix = "G_MOUNT_UNMOUNT_", cheader_filename = "gio/gio.h")]
+       [Flags]
+       public enum MountUnmountFlags {
+               NONE,
+               FORCE,
+       }
+       [CCode (cprefix = "G_OUTPUT_STREAM_SPLICE_", cheader_filename = "gio/gio.h")]
+       [Flags]
+       public enum OutputStreamSpliceFlags {
+               NONE,
+               CLOSE_SOURCE,
+               CLOSE_TARGET,
        }
-       [CCode (cheader_filename = "gio/gfileattribute.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FileAttributeInfo {
                public weak string name;
                public GLib.FileAttributeType type;
-               public GLib.FileAttributeFlags flags;
+               public GLib.FileAttributeInfoFlags flags;
        }
-       [CCode (ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref", cheader_filename = "gio/gfileattribute.h")]
+       [CCode (ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref", cheader_filename = "gio/gio.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 void add (string name, GLib.FileAttributeType type, GLib.FileAttributeInfoFlags 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/gfileattribute.h")]
+       [CCode (ref_function = "g_file_attribute_matcher_ref", unref_function = "g_file_attribute_matcher_unref", cheader_filename = "gio/gio.h")]
        public class FileAttributeMatcher {
                public bool enumerate_namespace (string ns);
                public weak string enumerate_next ();
@@ -160,60 +179,34 @@ namespace GLib {
                public bool matches_only (string attribute);
                public FileAttributeMatcher (string attributes);
        }
-       [CCode (cheader_filename = "gio/gfileattribute.h")]
-       public class FileAttributeValue {
-               public GLib.FileAttributeType type;
-               public GLib.FileAttributeStatus status;
-               public pointer u;
-               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 string);
-               public void set_int32 (int value);
-               public void set_int64 (int64 value);
-               public void set_object (GLib.Object obj);
-               public void set_string (string string);
-               public void set_uint32 (uint value);
-               public void set_uint64 (uint64 value);
-       }
-       [CCode (cheader_filename = "gio/gvfs.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FileIconClass {
        }
-       [CCode (cheader_filename = "gio/gvfs.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FileInfoClass {
        }
-       [CCode (cheader_filename = "gio/gioscheduler.h")]
-       public class IOJob {
-               public void send_to_mainloop (GLib.IODataFunc func, pointer user_data, GLib.DestroyNotify notify, bool block);
-       }
-       [CCode (cheader_filename = "gio/gvfs.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class IOModuleClass {
        }
-       [CCode (cheader_filename = "gio/gvfs.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
+       public class IOSchedulerJob {
+               public bool send_to_mainloop (GLib.SourceFunc func, pointer user_data, GLib.DestroyNotify notify);
+               public void send_to_mainloop_async (GLib.SourceFunc func, pointer user_data, GLib.DestroyNotify notify);
+       }
+       [CCode (cheader_filename = "gio/gio.h")]
        public class SimpleAsyncResultClass {
        }
-       [CCode (cheader_filename = "gio/gvfs.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class ThemedIconClass {
        }
-       [CCode (cheader_filename = "gio/gvfs.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class AppLaunchContext : GLib.Object {
                public virtual weak string get_display (GLib.AppInfo info, GLib.List files);
                public virtual weak string get_startup_notify_id (GLib.AppInfo info, GLib.List files);
                public virtual void launch_failed (string startup_notify_id);
                public AppLaunchContext ();
        }
-       [CCode (cheader_filename = "gio/gbufferedinputstream.h")]
+       [CCode (cheader_filename = "gio/gio.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);
@@ -223,10 +216,12 @@ namespace GLib {
                public BufferedInputStream (GLib.InputStream base_stream);
                public BufferedInputStream.sized (GLib.InputStream base_stream, ulong size);
                public ulong peek (pointer buffer, ulong offset, ulong count);
+               public pointer peek_buffer (ulong count);
+               public int read_byte (GLib.Cancellable cancellable) throws GLib.Error;
                public void set_buffer_size (ulong size);
                public weak uint buffer_size { get; set construct; }
        }
-       [CCode (cheader_filename = "gio/gbufferedoutputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class BufferedOutputStream : GLib.FilterOutputStream {
                public bool get_auto_grow ();
                public ulong get_buffer_size ();
@@ -234,20 +229,23 @@ namespace GLib {
                public BufferedOutputStream.sized (GLib.OutputStream base_stream, uint size);
                public void set_auto_grow (bool auto_grow);
                public void set_buffer_size (ulong size);
-               public weak uint buffer_size { get; construct; }
+               public weak bool auto_grow { get; set; }
+               public weak uint buffer_size { get; set construct; }
        }
-       [CCode (cheader_filename = "gio/gcancellable.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class Cancellable : GLib.Object {
                public void cancel ();
                public static weak GLib.Cancellable get_current ();
                public int get_fd ();
                public bool is_cancelled ();
                public Cancellable ();
+               public void pop_current ();
+               public void push_current ();
                public void reset ();
                public bool set_error_if_cancelled () throws GLib.Error;
                public signal void cancelled ();
        }
-       [CCode (cheader_filename = "gio/gdatainputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class DataInputStream : GLib.BufferedInputStream {
                public GLib.DataStreamByteOrder get_byte_order ();
                public GLib.DataStreamNewlineType get_newline_type ();
@@ -260,11 +258,13 @@ namespace GLib {
                public ushort read_uint16 (GLib.Cancellable cancellable) throws GLib.Error;
                public uint read_uint32 (GLib.Cancellable cancellable) throws GLib.Error;
                public uint64 read_uint64 (GLib.Cancellable cancellable) throws GLib.Error;
-               public weak string read_until (char stop_char, ulong length, GLib.Cancellable cancellable) throws GLib.Error;
+               public weak string read_until (string stop_chars, ulong length, GLib.Cancellable cancellable) throws GLib.Error;
                public void set_byte_order (GLib.DataStreamByteOrder order);
                public void set_newline_type (GLib.DataStreamNewlineType type);
+               public weak GLib.DataStreamByteOrder byte_order { get; set; }
+               public weak GLib.DataStreamNewlineType newline_type { get; set; }
        }
-       [CCode (cheader_filename = "gio/gdataoutputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class DataOutputStream : GLib.FilterOutputStream {
                public GLib.DataStreamByteOrder get_byte_order ();
                public DataOutputStream (GLib.OutputStream base_stream);
@@ -277,23 +277,23 @@ namespace GLib {
                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);
+               public weak GLib.DataStreamByteOrder byte_order { get; set; }
        }
-       [CCode (cheader_filename = "gio/gdirectorymonitor.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class DirectoryMonitor : GLib.Object {
                public virtual bool cancel ();
                public void emit_event (GLib.File child, GLib.File other_file, GLib.FileMonitorEvent event_type);
                public bool is_cancelled ();
                public void set_rate_limit (int limit_msecs);
+               [NoAccessorMethod]
+               public weak bool cancelled { get; }
+               [NoAccessorMethod]
+               public weak int rate_limit { get; set; }
                public signal void changed (GLib.File child, GLib.File other_file, int event_type);
        }
-       [CCode (cheader_filename = "gio/gdummyfile.h")]
-       public class DummyFile : GLib.Object, GLib.File {
-               public DummyFile (string uri);
-       }
-       [CCode (cheader_filename = "gio/gfileenumerator.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FileEnumerator : GLib.Object {
-               public virtual bool close (GLib.Cancellable cancellable) throws GLib.Error;
+               public 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 result) throws GLib.Error;
                public bool has_pending ();
@@ -303,22 +303,24 @@ namespace GLib {
                public virtual weak GLib.List next_files_finish (GLib.AsyncResult result) throws GLib.Error;
                public void set_pending (bool pending);
        }
-       [CCode (cheader_filename = "gio/gfileicon.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FileIcon : GLib.Object, GLib.Icon, GLib.LoadableIcon {
                public weak GLib.File get_file ();
                public FileIcon (GLib.File file);
        }
-       [CCode (cheader_filename = "gio/gfileinfo.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FileInfo : GLib.Object {
                public void clear_status ();
                public void copy_into (GLib.FileInfo dest_info);
                public weak GLib.FileInfo dup ();
-               public weak GLib.FileAttributeValue get_attribute (string attribute);
+               public weak string get_attribute_as_string (string attribute);
                public bool get_attribute_boolean (string attribute);
                public weak string get_attribute_byte_string (string attribute);
+               public bool get_attribute_data (string attribute, GLib.FileAttributeType type, pointer value_pp, GLib.FileAttributeStatus status);
                public int get_attribute_int32 (string attribute);
                public int64 get_attribute_int64 (string attribute);
                public weak GLib.Object get_attribute_object (string attribute);
+               public GLib.FileAttributeStatus get_attribute_status (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);
@@ -341,7 +343,7 @@ namespace GLib {
                public weak string list_attributes (string name_space);
                public FileInfo ();
                public void remove_attribute (string attribute);
-               public void set_attribute (string attribute, GLib.FileAttributeValue attr_value);
+               public void set_attribute (string attribute, GLib.FileAttributeType type, pointer value_p);
                public void set_attribute_boolean (string attribute, bool attr_value);
                public void set_attribute_byte_string (string attribute, string attr_value);
                public void set_attribute_int32 (string attribute, int attr_value);
@@ -365,7 +367,7 @@ namespace GLib {
                public void set_symlink_target (string symlink_target);
                public void unset_attribute_mask ();
        }
-       [CCode (cheader_filename = "gio/gfileinputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FileInputStream : GLib.InputStream, GLib.Seekable {
                public virtual bool can_seek ();
                public virtual weak GLib.FileInfo query_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
@@ -374,7 +376,7 @@ namespace GLib {
                public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable cancellable) throws GLib.Error;
                public virtual int64 tell ();
        }
-       [CCode (cheader_filename = "gio/gfilemonitor.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FileMonitor : GLib.Object {
                public virtual bool cancel ();
                public static weak GLib.DirectoryMonitor directory (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable cancellable);
@@ -382,9 +384,13 @@ namespace GLib {
                public static weak GLib.FileMonitor file (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable cancellable);
                public bool is_cancelled ();
                public void set_rate_limit (int limit_msecs);
+               [NoAccessorMethod]
+               public weak bool cancelled { get; }
+               [NoAccessorMethod]
+               public weak int rate_limit { get; set; }
                public signal void changed (GLib.File file, GLib.File other_file, int event_type);
        }
-       [CCode (cheader_filename = "gio/gfileoutputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FileOutputStream : GLib.OutputStream, GLib.Seekable {
                public virtual bool can_seek ();
                public virtual bool can_truncate ();
@@ -394,9 +400,9 @@ namespace GLib {
                public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult result) throws GLib.Error;
                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;
+               public bool truncate (int64 size, GLib.Cancellable cancellable) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gio/gfilenamecompleter.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FilenameCompleter : GLib.Object {
                public weak string get_completion_suffix (string initial_text);
                public weak string get_completions (string initial_text);
@@ -404,48 +410,49 @@ namespace GLib {
                public void set_dirs_only (bool dirs_only);
                public signal void got_completion_data ();
        }
-       [CCode (cheader_filename = "gio/gfilterinputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FilterInputStream : GLib.InputStream {
                public weak GLib.InputStream get_base_stream ();
                [NoAccessorMethod]
                public weak GLib.InputStream base_stream { get; construct; }
        }
-       [CCode (cheader_filename = "gio/gfilteroutputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class FilterOutputStream : GLib.OutputStream {
                public weak GLib.OutputStream get_base_stream ();
                [NoAccessorMethod]
                public weak GLib.OutputStream base_stream { get; construct; }
        }
-       [CCode (cheader_filename = "gio/giomodule.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class IOModule : GLib.TypeModule, GLib.TypePlugin {
                public void load ();
                public IOModule (string filename);
                public void unload ();
        }
-       [CCode (cheader_filename = "gio/ginputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class InputStream : GLib.Object {
-               public virtual bool close (GLib.Cancellable cancellable) throws GLib.Error;
+               public void clear_pending ();
+               public 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 result) throws GLib.Error;
                public bool has_pending ();
                public bool is_closed ();
-               public virtual long read (pointer buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
+               public long read (pointer buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
                public bool read_all (pointer buffer, ulong count, ulong bytes_read, GLib.Cancellable cancellable) throws GLib.Error;
                public virtual void read_async (pointer buffer, ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public virtual long read_finish (GLib.AsyncResult result) throws GLib.Error;
-               public void set_pending (bool pending);
+               public bool set_pending () throws GLib.Error;
                public virtual long skip (ulong count, GLib.Cancellable cancellable) throws GLib.Error;
                public virtual void skip_async (ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public virtual long skip_finish (GLib.AsyncResult result) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gio/gmemoryinputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class MemoryInputStream : GLib.InputStream, GLib.Seekable {
                public static weak GLib.InputStream from_data (pointer data, long len);
                public pointer get_data ();
                public ulong get_data_size ();
                public void set_free_data (bool free_data);
        }
-       [CCode (cheader_filename = "gio/gmemoryoutputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
                public weak GLib.ByteArray get_data ();
                public MemoryOutputStream (GLib.ByteArray data);
@@ -458,7 +465,7 @@ namespace GLib {
                [NoAccessorMethod]
                public weak uint size_limit { get; set; }
        }
-       [CCode (cheader_filename = "gio/gmountoperation.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class MountOperation : GLib.Object {
                public bool get_anonymous ();
                public int get_choice ();
@@ -473,14 +480,24 @@ namespace GLib {
                public void set_password (string password);
                public void set_password_save (GLib.PasswordSave save);
                public void set_username (string username);
+               public weak bool anonymous { get; set; }
+               public weak int choice { get; set; }
+               public weak string domain { get; set; }
+               public weak string password { get; set; }
+               public weak GLib.PasswordSave password_save { get; set; }
+               public weak string username { get; set; }
                public signal bool ask_password (string message, string default_user, string default_domain, uint flags);
                public signal bool ask_question (string message, pointer choices);
                [HasEmitter]
                public signal void reply (bool abort);
        }
-       [CCode (cheader_filename = "gio/goutputstream.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
+       public class NativeVolumeMonitor : GLib.VolumeMonitor {
+       }
+       [CCode (cheader_filename = "gio/gio.h")]
        public class OutputStream : GLib.Object {
-               public virtual bool close (GLib.Cancellable cancellable) throws GLib.Error;
+               public void clear_pending ();
+               public 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 result) throws GLib.Error;
                public virtual bool flush (GLib.Cancellable cancellable) throws GLib.Error;
@@ -488,16 +505,16 @@ namespace GLib {
                public virtual bool flush_finish (GLib.AsyncResult result) throws GLib.Error;
                public bool has_pending ();
                public bool is_closed ();
-               public void set_pending (bool pending);
+               public bool set_pending () throws GLib.Error;
                public virtual long splice (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public virtual void splice_async (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public virtual long splice_finish (GLib.AsyncResult result) throws GLib.Error;
-               public virtual long write (pointer buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
+               public long write (pointer buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error;
                public bool write_all (pointer buffer, ulong count, ulong bytes_written, GLib.Cancellable cancellable) throws GLib.Error;
                public virtual void write_async (pointer buffer, ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public virtual long write_finish (GLib.AsyncResult result) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gio/gsimpleasyncresult.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
                public void complete ();
                public void complete_in_idle ();
@@ -518,22 +535,14 @@ namespace GLib {
                public void set_op_res_gpointer (pointer op_res, GLib.DestroyNotify destroy_op_res);
                public void set_op_res_gssize (long op_res);
        }
-       [CCode (cheader_filename = "gio/gsocketinputstream.h")]
-       public class SocketInputStream : GLib.InputStream {
-               public SocketInputStream (int fd, bool close_fd_at_close);
-       }
-       [CCode (cheader_filename = "gio/gsocketoutputstream.h")]
-       public class SocketOutputStream : GLib.OutputStream {
-               public SocketOutputStream (int fd, bool close_fd_at_close);
-       }
-       [CCode (cheader_filename = "gio/gthemedicon.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class ThemedIcon : GLib.Object, GLib.Icon {
                public weak string get_names ();
                public ThemedIcon (string iconname);
                [NoArrayLength]
                public ThemedIcon.from_names (string[] iconnames, int len);
        }
-       [CCode (cheader_filename = "gio/gvfs.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class Vfs : GLib.Object {
                public static weak GLib.Vfs get_default ();
                public virtual weak GLib.File get_file_for_path (string path);
@@ -543,18 +552,27 @@ namespace GLib {
                public virtual bool is_active ();
                public virtual weak GLib.File parse_name (string parse_name);
        }
-       [CCode (cheader_filename = "gio/gvolumemonitor.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public class VolumeMonitor : GLib.Object {
+               public static weak GLib.Volume adopt_orphan_mount (GLib.Mount mount);
                public static weak GLib.VolumeMonitor get ();
                public virtual weak GLib.List get_connected_drives ();
-               public virtual weak GLib.List get_mounted_volumes ();
+               public virtual weak GLib.Mount get_mount_for_uuid (string uuid);
+               public virtual weak GLib.List get_mounts ();
+               public virtual weak GLib.Volume get_volume_for_uuid (string uuid);
+               public virtual weak GLib.List get_volumes ();
+               public signal void drive_changed (GLib.Drive drive);
                public signal void drive_connected (GLib.Drive drive);
                public signal void drive_disconnected (GLib.Drive drive);
-               public signal void volume_mounted (GLib.Volume volume);
-               public signal void volume_pre_unmount (GLib.Volume volume);
-               public signal void volume_unmounted (GLib.Volume volume);
-       }
-       [CCode (cheader_filename = "gio/gappinfo.h")]
+               public signal void mount_added (GLib.Mount mount);
+               public signal void mount_changed (GLib.Mount mount);
+               public signal void mount_pre_unmount (GLib.Mount mount);
+               public signal void mount_removed (GLib.Mount mount);
+               public signal void volume_added (GLib.Volume volume);
+               public signal void volume_changed (GLib.Volume volume);
+               public signal void volume_removed (GLib.Volume volume);
+       }
+       [CCode (cheader_filename = "gio/gio.h")]
        public interface AppInfo : GLib.Object {
                public abstract bool add_supports_type (string content_type) throws GLib.Error;
                public abstract bool can_remove_supports_type ();
@@ -578,45 +596,50 @@ namespace GLib {
                public abstract bool should_show (string desktop_env);
                public abstract bool supports_uris ();
        }
-       [CCode (cheader_filename = "gio/gvfs.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public interface AsyncResult : GLib.Object {
                public abstract weak GLib.Object get_source_object ();
                public abstract pointer get_user_data ();
        }
-       [CCode (cheader_filename = "gio/gvfs.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public interface Drive : GLib.Object {
                public abstract bool can_eject ();
-               public abstract bool can_mount ();
-               public abstract void eject (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract bool can_poll_for_media ();
+               public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool eject_finish (GLib.AsyncResult result) throws GLib.Error;
                public abstract weak GLib.Icon get_icon ();
                public abstract weak string get_name ();
                public abstract weak GLib.List get_volumes ();
+               public abstract bool has_media ();
                public abstract bool has_volumes ();
-               public abstract bool is_automounted ();
-               public abstract void mount (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-               public abstract bool mount_finish (GLib.AsyncResult result) throws GLib.Error;
+               public abstract bool is_media_check_automatic ();
+               public abstract bool is_media_removable ();
+               public abstract void poll_for_media (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract bool poll_for_media_finish (GLib.AsyncResult result) throws GLib.Error;
                public signal void changed ();
+               public signal void disconnected ();
+               public signal void eject_button ();
        }
-       [CCode (cheader_filename = "gio/gfile.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public interface File : GLib.Object {
                public abstract weak GLib.FileOutputStream append_to (GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void append_to_async (GLib.FileCreateFlags flags, 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 contains_file (GLib.File descendant);
                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 bool copy_attributes (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract weak GLib.FileOutputStream create (GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void create_async (GLib.FileCreateFlags flags, 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);
+               public abstract void eject_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool eject_mountable_finish (GLib.AsyncResult result) throws GLib.Error;
                public abstract weak GLib.FileEnumerator enumerate_children (string attributes, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void enumerate_children_async (string attributes, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract weak GLib.FileEnumerator enumerate_children_finish (GLib.AsyncResult res) throws GLib.Error;
                public abstract bool equal (GLib.File file2);
-               public abstract weak GLib.Volume find_enclosing_volume (GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract weak GLib.Mount find_enclosing_mount (GLib.Cancellable cancellable) throws GLib.Error;
                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;
@@ -636,6 +659,8 @@ namespace GLib {
                public bool load_partial_contents_finish (GLib.AsyncResult res, out weak string contents, ulong length, out weak string etag_out) 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_enclosing_volume (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract bool mount_enclosing_volume_finish (GLib.AsyncResult result) 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;
@@ -649,7 +674,7 @@ namespace GLib {
                public abstract weak GLib.FileInfo query_info_finish (GLib.AsyncResult res) throws GLib.Error;
                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 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 (string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
@@ -659,7 +684,7 @@ namespace GLib {
                public bool replace_contents_finish (GLib.AsyncResult res, out weak string new_etag) throws GLib.Error;
                public abstract weak GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error;
                public abstract weak GLib.File resolve_relative_path (string relative_path);
-               public abstract bool set_attribute (string attribute, GLib.FileAttributeValue value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract bool set_attribute (string attribute, GLib.FileAttributeType type, pointer value_p, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public bool set_attribute_byte_string (string attribute, string value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public bool set_attribute_int32 (string attribute, int value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public bool set_attribute_int64 (string attribute, int64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
@@ -673,47 +698,67 @@ namespace GLib {
                public abstract void set_display_name_async (string display_name, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract weak GLib.File set_display_name_finish (GLib.AsyncResult res) 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);
+               public abstract void unmount_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract bool unmount_mountable_finish (GLib.AsyncResult result) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gio/gicon.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public interface Icon : GLib.Object {
                public abstract bool equal (GLib.Icon icon2);
                public static uint hash (pointer icon);
        }
-       [CCode (cheader_filename = "gio/gvfs.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public interface LoadableIcon : GLib.Icon, GLib.Object {
                public abstract weak GLib.InputStream load (int size, out weak string type, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void load_async (int size, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
                public abstract weak GLib.InputStream load_finish (GLib.AsyncResult res, out weak string type) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gio/gseekable.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
+       public interface Mount : GLib.Object {
+               public abstract bool can_eject ();
+               public abstract bool can_unmount ();
+               public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, 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 GLib.Icon get_icon ();
+               public abstract weak string get_name ();
+               public abstract weak GLib.File get_root ();
+               public abstract weak string get_uuid ();
+               public abstract weak GLib.Volume get_volume ();
+               public abstract void remount (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract bool remount_finish (GLib.AsyncResult result) throws GLib.Error;
+               public abstract void unmount (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract bool unmount_finish (GLib.AsyncResult result) throws GLib.Error;
+               public signal void changed ();
+               public signal void unmounted ();
+       }
+       [CCode (cheader_filename = "gio/gio.h")]
        public interface Seekable : GLib.Object {
                public abstract bool can_seek ();
                public abstract bool can_truncate ();
                public abstract bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract int64 tell ();
-               public abstract bool truncate (int64 offset, GLib.Cancellable cancellable) throws GLib.Error;
+               public bool truncate (int64 offset, GLib.Cancellable cancellable) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gio/gvolume.h")]
+       [CCode (cheader_filename = "gio/gio.h")]
        public interface Volume : GLib.Object {
                public abstract bool can_eject ();
-               public abstract bool can_unmount ();
-               public abstract void eject (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract bool can_mount ();
+               public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, 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 GLib.Icon get_icon ();
+               public abstract weak GLib.Mount get_mount ();
                public abstract weak string get_name ();
-               public abstract weak GLib.File get_root ();
-               public abstract void unmount (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-               public abstract bool unmount_finish (GLib.AsyncResult result) throws GLib.Error;
+               public abstract weak string get_uuid ();
+               public void mount (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+               public abstract bool mount_finish (GLib.AsyncResult result) throws GLib.Error;
                public signal void changed ();
+               public signal void removed ();
        }
        public static delegate void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res, pointer user_data);
        public static delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes, pointer user_data);
        public static delegate bool FileReadMoreCallback (string file_contents, int64 file_size, pointer callback_data);
-       public static delegate void IODataFunc (pointer user_data);
-       public static delegate void IOJobFunc (GLib.IOJob job, GLib.Cancellable cancellable, pointer user_data);
+       public static delegate void IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable, pointer user_data);
        public static delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
        public const string FILE_ATTRIBUTE_ACCESS_CAN_DELETE;
        public const string FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE;
@@ -724,13 +769,13 @@ namespace GLib {
        public const string FILE_ATTRIBUTE_DOS_IS_ARCHIVE;
        public const string FILE_ATTRIBUTE_DOS_IS_SYSTEM;
        public const string FILE_ATTRIBUTE_ETAG_VALUE;
-       public const string FILE_ATTRIBUTE_FS_FREE;
-       public const string FILE_ATTRIBUTE_FS_READONLY;
-       public const string FILE_ATTRIBUTE_FS_SIZE;
-       public const string FILE_ATTRIBUTE_FS_TYPE;
+       public const string FILE_ATTRIBUTE_FILESYSTEM_FREE;
+       public const string FILE_ATTRIBUTE_FILESYSTEM_READONLY;
+       public const string FILE_ATTRIBUTE_FILESYSTEM_SIZE;
+       public const string FILE_ATTRIBUTE_FILESYSTEM_TYPE;
        public const string FILE_ATTRIBUTE_GVFS_BACKEND;
        public const string FILE_ATTRIBUTE_ID_FILE;
-       public const string FILE_ATTRIBUTE_ID_FS;
+       public const string FILE_ATTRIBUTE_ID_FILESYSTEM;
        public const string FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT;
        public const string FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT;
        public const string FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT;
@@ -739,21 +784,22 @@ namespace GLib {
        public const string FILE_ATTRIBUTE_OWNER_GROUP;
        public const string FILE_ATTRIBUTE_OWNER_USER;
        public const string FILE_ATTRIBUTE_OWNER_USER_REAL;
-       public const string FILE_ATTRIBUTE_STD_CONTENT_TYPE;
-       public const string FILE_ATTRIBUTE_STD_DISPLAY_NAME;
-       public const string FILE_ATTRIBUTE_STD_EDIT_NAME;
-       public const string FILE_ATTRIBUTE_STD_FAST_CONTENT_TYPE;
-       public const string FILE_ATTRIBUTE_STD_ICON;
-       public const string FILE_ATTRIBUTE_STD_IS_BACKUP;
-       public const string FILE_ATTRIBUTE_STD_IS_HIDDEN;
-       public const string FILE_ATTRIBUTE_STD_IS_SYMLINK;
-       public const string FILE_ATTRIBUTE_STD_IS_VIRTUAL;
-       public const string FILE_ATTRIBUTE_STD_NAME;
-       public const string FILE_ATTRIBUTE_STD_SIZE;
-       public const string FILE_ATTRIBUTE_STD_SORT_ORDER;
-       public const string FILE_ATTRIBUTE_STD_SYMLINK_TARGET;
-       public const string FILE_ATTRIBUTE_STD_TARGET_URI;
-       public const string FILE_ATTRIBUTE_STD_TYPE;
+       public const string FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE;
+       public const string FILE_ATTRIBUTE_STANDARD_COPY_NAME;
+       public const string FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME;
+       public const string FILE_ATTRIBUTE_STANDARD_EDIT_NAME;
+       public const string FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE;
+       public const string FILE_ATTRIBUTE_STANDARD_ICON;
+       public const string FILE_ATTRIBUTE_STANDARD_IS_BACKUP;
+       public const string FILE_ATTRIBUTE_STANDARD_IS_HIDDEN;
+       public const string FILE_ATTRIBUTE_STANDARD_IS_SYMLINK;
+       public const string FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL;
+       public const string FILE_ATTRIBUTE_STANDARD_NAME;
+       public const string FILE_ATTRIBUTE_STANDARD_SIZE;
+       public const string FILE_ATTRIBUTE_STANDARD_SORT_ORDER;
+       public const string FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET;
+       public const string FILE_ATTRIBUTE_STANDARD_TARGET_URI;
+       public const string FILE_ATTRIBUTE_STANDARD_TYPE;
        public const string FILE_ATTRIBUTE_THUMBNAILING_FAILED;
        public const string FILE_ATTRIBUTE_THUMBNAIL_PATH;
        public const string FILE_ATTRIBUTE_TIME_ACCESS;
@@ -774,10 +820,6 @@ namespace GLib {
        public const string FILE_ATTRIBUTE_UNIX_NLINK;
        public const string FILE_ATTRIBUTE_UNIX_RDEV;
        public const string FILE_ATTRIBUTE_UNIX_UID;
-       public const string URI_RESERVED_CHARS_GENERIC_DELIMITERS;
-       public const string URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS;
-       [CCode (cname = "g_cancel_all_io_jobs")]
-       public static void g_cancel_all_io_jobs ();
        [CCode (cname = "g_content_type_can_be_executable")]
        public static bool g_content_type_can_be_executable (string type);
        [CCode (cname = "g_content_type_equals")]
@@ -797,34 +839,18 @@ namespace GLib {
        public static bool g_content_type_is_unknown (string type);
        [CCode (cname = "g_content_types_get_registered")]
        public static weak GLib.List g_content_types_get_registered ();
-       [CCode (cname = "g_format_file_size_for_display")]
-       public static weak string g_format_file_size_for_display (int64 size);
        [CCode (cname = "g_io_error_from_errno")]
        public static GLib.IOErrorEnum g_io_error_from_errno (int err_no);
        [CCode (cname = "g_io_error_quark")]
        public static GLib.Quark g_io_error_quark ();
-       [CCode (cname = "g_io_modules_ensure_loaded")]
-       public static void g_io_modules_ensure_loaded (string directory);
-       [CCode (cname = "g_mount_for_location")]
-       public static void g_mount_for_location (GLib.File location, GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-       [CCode (cname = "g_mount_for_location_finish")]
-       public static bool g_mount_for_location_finish (GLib.File location, GLib.AsyncResult result) throws GLib.Error;
-       [CCode (cname = "g_pop_current_cancellable")]
-       public static void g_pop_current_cancellable (GLib.Cancellable cancellable);
-       [CCode (cname = "g_push_current_cancellable")]
-       public static void g_push_current_cancellable (GLib.Cancellable cancellable);
-       [CCode (cname = "g_schedule_io_job")]
-       public static void g_schedule_io_job (GLib.IOJobFunc job_func, pointer user_data, GLib.DestroyNotify notify, int io_priority, GLib.Cancellable cancellable);
+       [CCode (cname = "g_io_modules_load_all_in_directory")]
+       public static weak GLib.List g_io_modules_load_all_in_directory (string dirname);
+       [CCode (cname = "g_io_scheduler_cancel_all_jobs")]
+       public static void g_io_scheduler_cancel_all_jobs ();
+       [CCode (cname = "g_io_scheduler_push_job")]
+       public static void g_io_scheduler_push_job (GLib.IOSchedulerJobFunc job_func, pointer user_data, GLib.DestroyNotify notify, int io_priority, GLib.Cancellable cancellable);
        [CCode (cname = "g_simple_async_report_error_in_idle")]
        public static void g_simple_async_report_error_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, pointer user_data, GLib.Quark domain, int code, string format);
-       [CCode (cname = "g_string_append_uri_escaped")]
-       public static weak GLib.String g_string_append_uri_escaped (GLib.String string, string unescaped, string reserved_chars_allowed, bool allow_utf8);
-       [CCode (cname = "g_uri_escape_string")]
-       public static weak string g_uri_escape_string (string unescaped, string reserved_chars_allowed, bool allow_utf8);
-       [CCode (cname = "g_uri_get_scheme")]
-       public static weak string g_uri_get_scheme (string uri);
-       [CCode (cname = "g_uri_unescape_segment")]
-       public static weak string g_uri_unescape_segment (string escaped_string, string escaped_string_end, string illegal_characters);
-       [CCode (cname = "g_uri_unescape_string")]
-       public static weak string g_uri_unescape_string (string escaped_string, string illegal_characters);
+       [CCode (cname = "g_simple_async_report_gerror_in_idle")]
+       public static void g_simple_async_report_gerror_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, pointer user_data) throws GLib.Error;
 }
diff --git a/vapi/packages/gio-2.0/gio-2.0.defines b/vapi/packages/gio-2.0/gio-2.0.defines
new file mode 100644 (file)
index 0000000..4ecaa5c
--- /dev/null
@@ -0,0 +1 @@
+-DGIO_COMPILATION
index 0e9dc4c..26ed8d3 100644 (file)
@@ -1,2 +1,2 @@
-include/gio-standalone/gio
-lib/libgio.so
+include/glib-2.0/gio
+lib/libgio-2.0.so
index ecd3d04..6193a5a 100644 (file)
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <api version="1.0">
        <namespace name="GLib">
-               <function name="g_cancel_all_io_jobs" symbol="g_cancel_all_io_jobs">
-                       <return-type type="void"/>
-               </function>
                <function name="g_content_type_can_be_executable" symbol="g_content_type_can_be_executable">
                        <return-type type="gboolean"/>
                        <parameters>
                <function name="g_content_types_get_registered" symbol="g_content_types_get_registered">
                        <return-type type="GList*"/>
                </function>
-               <function name="g_format_file_size_for_display" symbol="g_format_file_size_for_display">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="size" type="goffset"/>
-                       </parameters>
-               </function>
                <function name="g_io_error_from_errno" symbol="g_io_error_from_errno">
                        <return-type type="GIOErrorEnum"/>
                        <parameters>
                <function name="g_io_error_quark" symbol="g_io_error_quark">
                        <return-type type="GQuark"/>
                </function>
-               <function name="g_io_modules_ensure_loaded" symbol="g_io_modules_ensure_loaded">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="directory" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="g_mount_for_location" symbol="g_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"/>
-                       </parameters>
-               </function>
-               <function name="g_mount_for_location_finish" symbol="g_mount_for_location_finish">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="location" type="GFile*"/>
-                               <parameter name="result" type="GAsyncResult*"/>
-                               <parameter name="error" type="GError**"/>
-                       </parameters>
-               </function>
-               <function name="g_pop_current_cancellable" symbol="g_pop_current_cancellable">
-                       <return-type type="void"/>
+               <function name="g_io_modules_load_all_in_directory" symbol="g_io_modules_load_all_in_directory">
+                       <return-type type="GList*"/>
                        <parameters>
-                               <parameter name="cancellable" type="GCancellable*"/>
+                               <parameter name="dirname" type="char*"/>
                        </parameters>
                </function>
-               <function name="g_push_current_cancellable" symbol="g_push_current_cancellable">
+               <function name="g_io_scheduler_cancel_all_jobs" symbol="g_io_scheduler_cancel_all_jobs">
                        <return-type type="void"/>
-                       <parameters>
-                               <parameter name="cancellable" type="GCancellable*"/>
-                       </parameters>
                </function>
-               <function name="g_schedule_io_job" symbol="g_schedule_io_job">
+               <function name="g_io_scheduler_push_job" symbol="g_io_scheduler_push_job">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="job_func" type="GIOJobFunc"/>
+                               <parameter name="job_func" type="GIOSchedulerJobFunc"/>
                                <parameter name="user_data" type="gpointer"/>
                                <parameter name="notify" type="GDestroyNotify"/>
                                <parameter name="io_priority" type="gint"/>
                                <parameter name="format" type="char*"/>
                        </parameters>
                </function>
-               <function name="g_string_append_uri_escaped" symbol="g_string_append_uri_escaped">
-                       <return-type type="GString*"/>
-                       <parameters>
-                               <parameter name="string" type="GString*"/>
-                               <parameter name="unescaped" type="char*"/>
-                               <parameter name="reserved_chars_allowed" type="char*"/>
-                               <parameter name="allow_utf8" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="g_uri_escape_string" symbol="g_uri_escape_string">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="unescaped" type="char*"/>
-                               <parameter name="reserved_chars_allowed" type="char*"/>
-                               <parameter name="allow_utf8" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="g_uri_get_scheme" symbol="g_uri_get_scheme">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="uri" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="g_uri_unescape_segment" symbol="g_uri_unescape_segment">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="escaped_string" type="char*"/>
-                               <parameter name="escaped_string_end" type="char*"/>
-                               <parameter name="illegal_characters" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="g_uri_unescape_string" symbol="g_uri_unescape_string">
-                       <return-type type="char*"/>
+               <function name="g_simple_async_report_gerror_in_idle" symbol="g_simple_async_report_gerror_in_idle">
+                       <return-type type="void"/>
                        <parameters>
-                               <parameter name="escaped_string" type="char*"/>
-                               <parameter name="illegal_characters" type="char*"/>
+                               <parameter name="object" type="GObject*"/>
+                               <parameter name="callback" type="GAsyncReadyCallback"/>
+                               <parameter name="user_data" type="gpointer"/>
+                               <parameter name="error" type="GError*"/>
                        </parameters>
                </function>
                <callback name="GAsyncReadyCallback">
                                <parameter name="callback_data" type="gpointer"/>
                        </parameters>
                </callback>
-               <callback name="GIODataFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GIOJobFunc">
+               <callback name="GIOSchedulerJobFunc">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="job" type="GIOJob*"/>
+                               <parameter name="job" type="GIOSchedulerJob*"/>
                                <parameter name="cancellable" type="GCancellable*"/>
                                <parameter name="user_data" type="gpointer"/>
                        </parameters>
                <struct name="GFileAttributeInfo">
                        <field name="name" type="char*"/>
                        <field name="type" type="GFileAttributeType"/>
-                       <field name="flags" type="GFileAttributeFlags"/>
+                       <field name="flags" type="GFileAttributeInfoFlags"/>
                </struct>
                <struct name="GFileAttributeInfoList">
                        <method name="add" symbol="g_file_attribute_info_list_add">
                                        <parameter name="list" type="GFileAttributeInfoList*"/>
                                        <parameter name="name" type="char*"/>
                                        <parameter name="type" type="GFileAttributeType"/>
-                                       <parameter name="flags" type="GFileAttributeFlags"/>
+                                       <parameter name="flags" type="GFileAttributeInfoFlags"/>
                                </parameters>
                        </method>
                        <method name="dup" symbol="g_file_attribute_info_list_dup">
                                </parameters>
                        </method>
                </struct>
-               <struct name="GFileAttributeValue">
-                       <method name="as_string" symbol="g_file_attribute_value_as_string">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="clear" symbol="g_file_attribute_value_clear">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="dup" symbol="g_file_attribute_value_dup">
-                               <return-type type="GFileAttributeValue*"/>
-                               <parameters>
-                                       <parameter name="other" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="g_file_attribute_value_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_boolean" symbol="g_file_attribute_value_get_boolean">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_byte_string" symbol="g_file_attribute_value_get_byte_string">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_int32" symbol="g_file_attribute_value_get_int32">
-                               <return-type type="gint32"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_int64" symbol="g_file_attribute_value_get_int64">
-                               <return-type type="gint64"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_object" symbol="g_file_attribute_value_get_object">
-                               <return-type type="GObject*"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_string" symbol="g_file_attribute_value_get_string">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_uint32" symbol="g_file_attribute_value_get_uint32">
-                               <return-type type="guint32"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_uint64" symbol="g_file_attribute_value_get_uint64">
-                               <return-type type="guint64"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                               </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 name="attr" type="GFileAttributeValue*"/>
-                                       <parameter name="new_value" type="GFileAttributeValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_boolean" symbol="g_file_attribute_value_set_boolean">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                                       <parameter name="value" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_byte_string" symbol="g_file_attribute_value_set_byte_string">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                                       <parameter name="string" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_int32" symbol="g_file_attribute_value_set_int32">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                                       <parameter name="value" type="gint32"/>
-                               </parameters>
-                       </method>
-                       <method name="set_int64" symbol="g_file_attribute_value_set_int64">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                                       <parameter name="value" type="gint64"/>
-                               </parameters>
-                       </method>
-                       <method name="set_object" symbol="g_file_attribute_value_set_object">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                                       <parameter name="obj" type="GObject*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_string" symbol="g_file_attribute_value_set_string">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                                       <parameter name="string" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_uint32" symbol="g_file_attribute_value_set_uint32">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                                       <parameter name="value" type="guint32"/>
-                               </parameters>
-                       </method>
-                       <method name="set_uint64" symbol="g_file_attribute_value_set_uint64">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="attr" type="GFileAttributeValue*"/>
-                                       <parameter name="value" type="guint64"/>
-                               </parameters>
-                       </method>
-                       <field name="type" type="GFileAttributeType"/>
-                       <field name="status" type="GFileAttributeStatus"/>
-                       <field name="u" type="gpointer"/>
-               </struct>
                <struct name="GFileIconClass">
                </struct>
                <struct name="GFileInfoClass">
                </struct>
-               <struct name="GIOJob">
-                       <method name="send_to_mainloop" symbol="g_io_job_send_to_mainloop">
+               <struct name="GIOModuleClass">
+               </struct>
+               <struct name="GIOSchedulerJob">
+                       <method name="send_to_mainloop" symbol="g_io_scheduler_job_send_to_mainloop">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="job" type="GIOSchedulerJob*"/>
+                                       <parameter name="func" type="GSourceFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="notify" type="GDestroyNotify"/>
+                               </parameters>
+                       </method>
+                       <method name="send_to_mainloop_async" symbol="g_io_scheduler_job_send_to_mainloop_async">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="job" type="GIOJob*"/>
-                                       <parameter name="func" type="GIODataFunc"/>
+                                       <parameter name="job" type="GIOSchedulerJob*"/>
+                                       <parameter name="func" type="GSourceFunc"/>
                                        <parameter name="user_data" type="gpointer"/>
                                        <parameter name="notify" type="GDestroyNotify"/>
-                                       <parameter name="block" type="gboolean"/>
                                </parameters>
                        </method>
                </struct>
-               <struct name="GIOModuleClass">
-               </struct>
                <struct name="GSimpleAsyncResultClass">
                </struct>
                <struct name="GThemedIconClass">
                </struct>
-               <enum name="GAppInfoCreateFlags">
-                       <member name="G_APP_INFO_CREATE_FLAGS_NONE" value="0"/>
-                       <member name="G_APP_INFO_CREATE_NEEDS_TERMINAL" value="1"/>
-               </enum>
                <enum name="GDataStreamByteOrder">
                        <member name="G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN" value="0"/>
                        <member name="G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN" value="1"/>
                        <member name="G_DATA_STREAM_NEWLINE_TYPE_CR_LF" value="2"/>
                        <member name="G_DATA_STREAM_NEWLINE_TYPE_ANY" value="3"/>
                </enum>
-               <enum name="GFileAttributeFlags">
-                       <member name="G_FILE_ATTRIBUTE_FLAGS_NONE" value="0"/>
-                       <member name="G_FILE_ATTRIBUTE_FLAGS_COPY_WITH_FILE" value="1"/>
-                       <member name="G_FILE_ATTRIBUTE_FLAGS_COPY_WHEN_MOVED" value="2"/>
-               </enum>
                <enum name="GFileAttributeStatus">
                        <member name="G_FILE_ATTRIBUTE_STATUS_UNSET" value="0"/>
                        <member name="G_FILE_ATTRIBUTE_STATUS_SET" value="1"/>
                        <member name="G_FILE_ATTRIBUTE_TYPE_INT64" value="7"/>
                        <member name="G_FILE_ATTRIBUTE_TYPE_OBJECT" value="8"/>
                </enum>
-               <enum name="GFileCopyFlags">
-                       <member name="G_FILE_COPY_OVERWRITE" value="1"/>
-                       <member name="G_FILE_COPY_BACKUP" value="2"/>
-                       <member name="G_FILE_COPY_NOFOLLOW_SYMLINKS" value="4"/>
-                       <member name="G_FILE_COPY_ALL_METADATA" value="8"/>
-               </enum>
-               <enum name="GFileCreateFlags">
-                       <member name="G_FILE_CREATE_FLAGS_NONE" value="0"/>
-                       <member name="G_FILE_CREATE_FLAGS_PRIVATE" value="1"/>
-               </enum>
                <enum name="GFileMonitorEvent">
                        <member name="G_FILE_MONITOR_EVENT_CHANGED" value="0"/>
                        <member name="G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT" value="1"/>
                        <member name="G_FILE_MONITOR_EVENT_PRE_UNMOUNT" value="5"/>
                        <member name="G_FILE_MONITOR_EVENT_UNMOUNTED" value="6"/>
                </enum>
-               <enum name="GFileMonitorFlags">
-                       <member name="G_FILE_MONITOR_FLAGS_NONE" value="0"/>
-                       <member name="G_FILE_MONITOR_FLAGS_MONITOR_MOUNTS" value="1"/>
-               </enum>
-               <enum name="GFileQueryInfoFlags">
-                       <member name="G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS" value="1"/>
-               </enum>
                <enum name="GFileType">
                        <member name="G_FILE_TYPE_UNKNOWN" value="0"/>
                        <member name="G_FILE_TYPE_REGULAR" value="1"/>
                        <member name="G_IO_ERROR_BUSY" value="26"/>
                        <member name="G_IO_ERROR_WOULD_BLOCK" value="27"/>
                        <member name="G_IO_ERROR_HOST_NOT_FOUND" value="28"/>
-               </enum>
-               <enum name="GOutputStreamSpliceFlags">
-                       <member name="G_OUTPUT_STREAM_SPLICE_FLAGS_NONE" value="0"/>
-                       <member name="G_OUTPUT_STREAM_SPLICE_FLAGS_CLOSE_SOURCE" value="1"/>
-                       <member name="G_OUTPUT_STREAM_SPLICE_FLAGS_CLOSE_TARGET" value="2"/>
-               </enum>
-               <enum name="GPasswordFlags">
-                       <member name="G_PASSWORD_FLAGS_NEED_PASSWORD" value="1"/>
-                       <member name="G_PASSWORD_FLAGS_NEED_USERNAME" value="2"/>
-                       <member name="G_PASSWORD_FLAGS_NEED_DOMAIN" value="4"/>
-                       <member name="G_PASSWORD_FLAGS_SAVING_SUPPORTED" value="16"/>
-                       <member name="G_PASSWORD_FLAGS_ANON_SUPPORTED" value="32"/>
+                       <member name="G_IO_ERROR_WOULD_MERGE" value="29"/>
+                       <member name="G_IO_ERROR_FAILED_HANDLED" value="30"/>
                </enum>
                <enum name="GPasswordSave">
                        <member name="G_PASSWORD_SAVE_NEVER" value="0"/>
                        <member name="G_PASSWORD_SAVE_FOR_SESSION" value="1"/>
                        <member name="G_PASSWORD_SAVE_PERMANENTLY" value="2"/>
                </enum>
+               <flags name="GAppInfoCreateFlags">
+                       <member name="G_APP_INFO_CREATE_NONE" value="0"/>
+                       <member name="G_APP_INFO_CREATE_NEEDS_TERMINAL" value="1"/>
+               </flags>
+               <flags name="GAskPasswordFlags">
+                       <member name="G_ASK_PASSWORD_NEED_PASSWORD" value="1"/>
+                       <member name="G_ASK_PASSWORD_NEED_USERNAME" value="2"/>
+                       <member name="G_ASK_PASSWORD_NEED_DOMAIN" value="4"/>
+                       <member name="G_ASK_PASSWORD_SAVING_SUPPORTED" value="8"/>
+                       <member name="G_ASK_PASSWORD_ANONYMOUS_SUPPORTED" value="16"/>
+               </flags>
+               <flags name="GFileAttributeInfoFlags">
+                       <member name="G_FILE_ATTRIBUTE_INFO_NONE" value="0"/>
+                       <member name="G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE" value="1"/>
+                       <member name="G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED" value="2"/>
+               </flags>
+               <flags name="GFileCopyFlags">
+                       <member name="G_FILE_COPY_NONE" value="0"/>
+                       <member name="G_FILE_COPY_OVERWRITE" value="1"/>
+                       <member name="G_FILE_COPY_BACKUP" value="2"/>
+                       <member name="G_FILE_COPY_NOFOLLOW_SYMLINKS" value="4"/>
+                       <member name="G_FILE_COPY_ALL_METADATA" value="8"/>
+                       <member name="G_FILE_COPY_NO_FALLBACK_FOR_MOVE" value="16"/>
+               </flags>
+               <flags name="GFileCreateFlags">
+                       <member name="G_FILE_CREATE_NONE" value="0"/>
+                       <member name="G_FILE_CREATE_PRIVATE" value="1"/>
+               </flags>
+               <flags name="GFileMonitorFlags">
+                       <member name="G_FILE_MONITOR_NONE" value="0"/>
+                       <member name="G_FILE_MONITOR_WATCH_MOUNTS" value="1"/>
+               </flags>
+               <flags name="GFileQueryInfoFlags">
+                       <member name="G_FILE_QUERY_INFO_NONE" value="0"/>
+                       <member name="G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS" value="1"/>
+               </flags>
+               <flags name="GMountUnmountFlags">
+                       <member name="G_MOUNT_UNMOUNT_NONE" value="0"/>
+                       <member name="G_MOUNT_UNMOUNT_FORCE" value="1"/>
+               </flags>
+               <flags name="GOutputStreamSpliceFlags">
+                       <member name="G_OUTPUT_STREAM_SPLICE_NONE" value="0"/>
+                       <member name="G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE" value="1"/>
+                       <member name="G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET" value="2"/>
+               </flags>
                <object name="GAppLaunchContext" parent="GObject" type-name="GAppLaunchContext" get-type="g_app_launch_context_get_type">
                        <method name="get_display" symbol="g_app_launch_context_get_display">
                                <return-type type="char*"/>
                                        <parameter name="count" type="gsize"/>
                                </parameters>
                        </method>
+                       <method name="peek_buffer" symbol="g_buffered_input_stream_peek_buffer">
+                               <return-type type="void*"/>
+                               <parameters>
+                                       <parameter name="stream" type="GBufferedInputStream*"/>
+                                       <parameter name="count" type="gsize*"/>
+                               </parameters>
+                       </method>
+                       <method name="read_byte" symbol="g_buffered_input_stream_read_byte">
+                               <return-type type="int"/>
+                               <parameters>
+                                       <parameter name="stream" type="GBufferedInputStream*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </method>
                        <method name="set_buffer_size" symbol="g_buffered_input_stream_set_buffer_size">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="size" type="gsize"/>
                                </parameters>
                        </method>
-                       <property name="buffer-size" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="auto-grow" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="buffer-size" type="guint" readable="1" writable="1" construct="1" construct-only="0"/>
                </object>
                <object name="GCancellable" parent="GObject" type-name="GCancellable" get-type="g_cancellable_get_type">
                        <method name="cancel" symbol="g_cancellable_cancel">
                        <constructor name="new" symbol="g_cancellable_new">
                                <return-type type="GCancellable*"/>
                        </constructor>
+                       <method name="pop_current" symbol="g_cancellable_pop_current">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                               </parameters>
+                       </method>
+                       <method name="push_current" symbol="g_cancellable_push_current">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                               </parameters>
+                       </method>
                        <method name="reset" symbol="g_cancellable_reset">
                                <return-type type="void"/>
                                <parameters>
                                <return-type type="char*"/>
                                <parameters>
                                        <parameter name="stream" type="GDataInputStream*"/>
-                                       <parameter name="stop_char" type="gchar"/>
+                                       <parameter name="stop_chars" type="gchar*"/>
                                        <parameter name="length" type="gsize*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="error" type="GError**"/>
                        <method name="set_newline_type" symbol="g_data_input_stream_set_newline_type">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="data_stream" type="GDataInputStream*"/>
+                                       <parameter name="stream" type="GDataInputStream*"/>
                                        <parameter name="type" type="GDataStreamNewlineType"/>
                                </parameters>
                        </method>
+                       <property name="byte-order" type="GDataStreamByteOrder" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="newline-type" type="GDataStreamNewlineType" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
                <object name="GDataOutputStream" parent="GFilterOutputStream" type-name="GDataOutputStream" get-type="g_data_output_stream_get_type">
                        <method name="get_byte_order" symbol="g_data_output_stream_get_byte_order">
                        <method name="put_byte" symbol="g_data_output_stream_put_byte">
                                <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="data_stream" type="GDataOutputStream*"/>
+                                       <parameter name="stream" type="GDataOutputStream*"/>
                                        <parameter name="data" type="guchar"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="error" type="GError**"/>
                        <method name="set_byte_order" symbol="g_data_output_stream_set_byte_order">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="data_stream" type="GDataOutputStream*"/>
+                                       <parameter name="stream" type="GDataOutputStream*"/>
                                        <parameter name="order" type="GDataStreamByteOrder"/>
                                </parameters>
                        </method>
-                       <method name="set_expand_buffer" symbol="g_data_output_stream_set_expand_buffer">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="data_stream" type="GDataOutputStream*"/>
-                                       <parameter name="expand_buffer" type="gboolean"/>
-                               </parameters>
-                       </method>
+                       <property name="byte-order" type="GDataStreamByteOrder" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
                <object name="GDirectoryMonitor" parent="GObject" type-name="GDirectoryMonitor" get-type="g_directory_monitor_get_type">
                        <method name="cancel" symbol="g_directory_monitor_cancel">
                                        <parameter name="limit_msecs" type="int"/>
                                </parameters>
                        </method>
+                       <property name="cancelled" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="rate-limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
                        <signal name="changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
                                </parameters>
                        </vfunc>
                </object>
-               <object name="GDummyFile" parent="GObject" type-name="GDummyFile" get-type="g_dummy_file_get_type">
-                       <implements>
-                               <interface name="GFile"/>
-                       </implements>
-                       <constructor name="new" symbol="g_dummy_file_new">
-                               <return-type type="GFile*"/>
-                               <parameters>
-                                       <parameter name="uri" type="char*"/>
-                               </parameters>
-                       </constructor>
-               </object>
                <object name="GFileEnumerator" parent="GObject" type-name="GFileEnumerator" get-type="g_file_enumerator_get_type">
                        <method name="close" symbol="g_file_enumerator_close">
                                <return-type type="gboolean"/>
                                        <parameter name="pending" type="gboolean"/>
                                </parameters>
                        </method>
-                       <vfunc name="close">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="enumerator" type="GFileEnumerator*"/>
-                                       <parameter name="cancellable" type="GCancellable*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </vfunc>
                        <vfunc name="close_async">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="close_fn">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="enumerator" type="GFileEnumerator*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </vfunc>
                        <vfunc name="next_file">
                                <return-type type="GFileInfo*"/>
                                <parameters>
                                        <parameter name="other" type="GFileInfo*"/>
                                </parameters>
                        </method>
-                       <method name="get_attribute" symbol="g_file_info_get_attribute">
-                               <return-type type="GFileAttributeValue*"/>
+                       <method name="get_attribute_as_string" symbol="g_file_info_get_attribute_as_string">
+                               <return-type type="char*"/>
                                <parameters>
                                        <parameter name="info" type="GFileInfo*"/>
                                        <parameter name="attribute" type="char*"/>
                                        <parameter name="attribute" type="char*"/>
                                </parameters>
                        </method>
+                       <method name="get_attribute_data" symbol="g_file_info_get_attribute_data">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="info" type="GFileInfo*"/>
+                                       <parameter name="attribute" type="char*"/>
+                                       <parameter name="type" type="GFileAttributeType*"/>
+                                       <parameter name="value_pp" type="gpointer*"/>
+                                       <parameter name="status" type="GFileAttributeStatus*"/>
+                               </parameters>
+                       </method>
                        <method name="get_attribute_int32" symbol="g_file_info_get_attribute_int32">
                                <return-type type="gint32"/>
                                <parameters>
                                        <parameter name="attribute" type="char*"/>
                                </parameters>
                        </method>
+                       <method name="get_attribute_status" symbol="g_file_info_get_attribute_status">
+                               <return-type type="GFileAttributeStatus"/>
+                               <parameters>
+                                       <parameter name="info" type="GFileInfo*"/>
+                                       <parameter name="attribute" type="char*"/>
+                               </parameters>
+                       </method>
                        <method name="get_attribute_string" symbol="g_file_info_get_attribute_string">
                                <return-type type="char*"/>
                                <parameters>
                                <parameters>
                                        <parameter name="info" type="GFileInfo*"/>
                                        <parameter name="attribute" type="char*"/>
-                                       <parameter name="attr_value" type="GFileAttributeValue*"/>
+                                       <parameter name="type" type="GFileAttributeType"/>
+                                       <parameter name="value_p" type="gpointer"/>
                                </parameters>
                        </method>
                        <method name="set_attribute_boolean" symbol="g_file_info_set_attribute_boolean">
                                        <parameter name="limit_msecs" type="int"/>
                                </parameters>
                        </method>
+                       <property name="cancelled" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="rate-limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
                        <signal name="changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="stream" type="GFileOutputStream*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="truncate">
+                       <vfunc name="truncate_fn">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="stream" type="GFileOutputStream*"/>
                        </method>
                </object>
                <object name="GInputStream" parent="GObject" type-name="GInputStream" get-type="g_input_stream_get_type">
+                       <method name="clear_pending" symbol="g_input_stream_clear_pending">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="stream" type="GInputStream*"/>
+                               </parameters>
+                       </method>
                        <method name="close" symbol="g_input_stream_close">
                                <return-type type="gboolean"/>
                                <parameters>
                                </parameters>
                        </method>
                        <method name="set_pending" symbol="g_input_stream_set_pending">
-                               <return-type type="void"/>
+                               <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="stream" type="GInputStream*"/>
-                                       <parameter name="pending" type="gboolean"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
                        <method name="skip" symbol="g_input_stream_skip">
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <vfunc name="close">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="stream" type="GInputStream*"/>
-                                       <parameter name="cancellable" type="GCancellable*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </vfunc>
                        <vfunc name="close_async">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="read">
-                               <return-type type="gssize"/>
+                       <vfunc name="close_fn">
+                               <return-type type="gboolean"/>
                                <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**"/>
                                </parameters>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="read_fn">
+                               <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**"/>
+                               </parameters>
+                       </vfunc>
                        <vfunc name="skip">
                                <return-type type="gssize"/>
                                <parameters>
                                        <parameter name="username" type="char*"/>
                                </parameters>
                        </method>
+                       <property name="anonymous" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="choice" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="domain" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="password" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="password-save" type="GPasswordSave" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="username" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
                        <signal name="ask-password" when="LAST">
                                <return-type type="gboolean"/>
                                <parameters>
                                </parameters>
                        </signal>
                </object>
+               <object name="GNativeVolumeMonitor" parent="GVolumeMonitor" type-name="GNativeVolumeMonitor" get-type="g_native_volume_monitor_get_type">
+                       <vfunc name="get_mount_for_mount_path">
+                               <return-type type="GMount*"/>
+                               <parameters>
+                                       <parameter name="mount_path" type="char*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                               </parameters>
+                       </vfunc>
+               </object>
                <object name="GOutputStream" parent="GObject" type-name="GOutputStream" get-type="g_output_stream_get_type">
+                       <method name="clear_pending" symbol="g_output_stream_clear_pending">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="stream" type="GOutputStream*"/>
+                               </parameters>
+                       </method>
                        <method name="close" symbol="g_output_stream_close">
                                <return-type type="gboolean"/>
                                <parameters>
                                </parameters>
                        </method>
                        <method name="set_pending" symbol="g_output_stream_set_pending">
-                               <return-type type="void"/>
+                               <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="stream" type="GOutputStream*"/>
-                                       <parameter name="pending" type="gboolean"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
                        <method name="splice" symbol="g_output_stream_splice">
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
-                       <vfunc name="close">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="stream" type="GOutputStream*"/>
-                                       <parameter name="cancellable" type="GCancellable*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </vfunc>
                        <vfunc name="close_async">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="close_fn">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="stream" type="GOutputStream*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </vfunc>
                        <vfunc name="flush">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
-                       <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**"/>
-                               </parameters>
-                       </vfunc>
                        <vfunc name="write_async">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="write_fn">
+                               <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**"/>
+                               </parameters>
+                       </vfunc>
                </object>
                <object name="GSimpleAsyncResult" parent="GObject" type-name="GSimpleAsyncResult" get-type="g_simple_async_result_get_type">
                        <implements>
                                </parameters>
                        </method>
                </object>
-               <object name="GSocketInputStream" parent="GInputStream" type-name="GSocketInputStream" get-type="g_socket_input_stream_get_type">
-                       <constructor name="new" symbol="g_socket_input_stream_new">
-                               <return-type type="GInputStream*"/>
-                               <parameters>
-                                       <parameter name="fd" type="int"/>
-                                       <parameter name="close_fd_at_close" type="gboolean"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GSocketOutputStream" parent="GOutputStream" type-name="GSocketOutputStream" get-type="g_socket_output_stream_get_type">
-                       <constructor name="new" symbol="g_socket_output_stream_new">
-                               <return-type type="GOutputStream*"/>
-                               <parameters>
-                                       <parameter name="fd" type="int"/>
-                                       <parameter name="close_fd_at_close" type="gboolean"/>
-                               </parameters>
-                       </constructor>
-               </object>
                <object name="GThemedIcon" parent="GObject" type-name="GThemedIcon" get-type="g_themed_icon_get_type">
                        <implements>
                                <interface name="GIcon"/>
                        </vfunc>
                </object>
                <object name="GVolumeMonitor" parent="GObject" type-name="GVolumeMonitor" get-type="g_volume_monitor_get_type">
+                       <method name="adopt_orphan_mount" symbol="g_volume_monitor_adopt_orphan_mount">
+                               <return-type type="GVolume*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </method>
                        <method name="get" symbol="g_volume_monitor_get">
                                <return-type type="GVolumeMonitor*"/>
                        </method>
                                        <parameter name="volume_monitor" type="GVolumeMonitor*"/>
                                </parameters>
                        </method>
-                       <method name="get_mounted_volumes" symbol="g_volume_monitor_get_mounted_volumes">
+                       <method name="get_mount_for_uuid" symbol="g_volume_monitor_get_mount_for_uuid">
+                               <return-type type="GMount*"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                                       <parameter name="uuid" type="char*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_mounts" symbol="g_volume_monitor_get_mounts">
+                               <return-type type="GList*"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_volume_for_uuid" symbol="g_volume_monitor_get_volume_for_uuid">
+                               <return-type type="GVolume*"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                                       <parameter name="uuid" type="char*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_volumes" symbol="g_volume_monitor_get_volumes">
                                <return-type type="GList*"/>
                                <parameters>
                                        <parameter name="volume_monitor" type="GVolumeMonitor*"/>
                                </parameters>
                        </method>
+                       <signal name="drive-changed" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                                       <parameter name="drive" type="GDrive*"/>
+                               </parameters>
+                       </signal>
                        <signal name="drive-connected" when="LAST">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                                </parameters>
                        </signal>
-                       <signal name="volume-mounted" when="LAST">
+                       <signal name="mount-added" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="mount-changed" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="mount-pre-unmount" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="mount-removed" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="volume-added" when="LAST">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume_monitor" type="GVolumeMonitor*"/>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </signal>
-                       <signal name="volume-pre-unmount" when="LAST">
+                       <signal name="volume-changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume_monitor" type="GVolumeMonitor*"/>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </signal>
-                       <signal name="volume-unmounted" when="LAST">
+                       <signal name="volume-removed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume_monitor" type="GVolumeMonitor*"/>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </signal>
+                       <vfunc name="adopt_orphan_mount">
+                               <return-type type="GVolume*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </vfunc>
                        <vfunc name="get_connected_drives">
                                <return-type type="GList*"/>
                                <parameters>
                                        <parameter name="volume_monitor" type="GVolumeMonitor*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="get_mounted_volumes">
+                       <vfunc name="get_mount_for_uuid">
+                               <return-type type="GMount*"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                                       <parameter name="uuid" type="char*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="get_mounts">
                                <return-type type="GList*"/>
                                <parameters>
                                        <parameter name="volume_monitor" type="GVolumeMonitor*"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="get_volume_for_uuid">
+                               <return-type type="GVolume*"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                                       <parameter name="uuid" type="char*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="get_volumes">
+                               <return-type type="GList*"/>
+                               <parameters>
+                                       <parameter name="volume_monitor" type="GVolumeMonitor*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="is_supported">
+                               <return-type type="gboolean"/>
+                       </vfunc>
                </object>
                <interface name="GAppInfo" type-name="GAppInfo" get-type="g_app_info_get_type">
                        <requires>
                                        <parameter name="appinfo" type="GAppInfo*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="supports_xdg_startup_notify">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="appinfo" type="GAppInfo*"/>
-                               </parameters>
-                       </vfunc>
                </interface>
                <interface name="GAsyncResult" type-name="GAsyncResult" get-type="g_async_result_get_type">
                        <requires>
                                        <parameter name="drive" type="GDrive*"/>
                                </parameters>
                        </method>
-                       <method name="can_mount" symbol="g_drive_can_mount">
+                       <method name="can_poll_for_media" symbol="g_drive_can_poll_for_media">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                        <parameter name="drive" type="GDrive*"/>
                                </parameters>
                        </method>
+                       <method name="has_media" symbol="g_drive_has_media">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="drive" type="GDrive*"/>
+                               </parameters>
+                       </method>
                        <method name="has_volumes" symbol="g_drive_has_volumes">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                                </parameters>
                        </method>
-                       <method name="is_automounted" symbol="g_drive_is_automounted">
+                       <method name="is_media_check_automatic" symbol="g_drive_is_media_check_automatic">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="drive" type="GDrive*"/>
+                               </parameters>
+                       </method>
+                       <method name="is_media_removable" symbol="g_drive_is_media_removable">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                                </parameters>
                        </method>
-                       <method name="mount" symbol="g_drive_mount">
+                       <method name="poll_for_media" symbol="g_drive_poll_for_media">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
-                                       <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="mount_finish" symbol="g_drive_mount_finish">
+                       <method name="poll_for_media_finish" symbol="g_drive_poll_for_media_finish">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                        <signal name="changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="volume" type="GDrive*"/>
+                                       <parameter name="drive" type="GDrive*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="disconnected" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="drive" type="GDrive*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="eject-button" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="drive" type="GDrive*"/>
                                </parameters>
                        </signal>
                        <vfunc name="can_eject">
                                        <parameter name="drive" type="GDrive*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="can_mount">
+                       <vfunc name="can_poll_for_media">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                        <parameter name="drive" type="GDrive*"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="has_media">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="drive" type="GDrive*"/>
+                               </parameters>
+                       </vfunc>
                        <vfunc name="has_volumes">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="is_automounted">
+                       <vfunc name="is_media_check_automatic">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="mount">
+                       <vfunc name="is_media_removable">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="drive" type="GDrive*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="poll_for_media">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
-                                       <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="mount_finish">
+                       <vfunc name="poll_for_media_finish">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="drive" type="GDrive*"/>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
+                       <method name="copy_attributes" symbol="g_file_copy_attributes">
+                               <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="error" type="GError**"/>
+                               </parameters>
+                       </method>
                        <method name="create" symbol="g_file_create">
                                <return-type type="GFileOutputStream*"/>
                                <parameters>
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                        <parameter name="file2" type="GFile*"/>
                                </parameters>
                        </method>
-                       <method name="find_enclosing_volume" symbol="g_file_find_enclosing_volume">
-                               <return-type type="GVolume*"/>
+                       <method name="find_enclosing_mount" symbol="g_file_find_enclosing_mount">
+                               <return-type type="GMount*"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </method>
+                       <method name="mount_enclosing_volume" symbol="g_file_mount_enclosing_volume">
+                               <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"/>
+                               </parameters>
+                       </method>
+                       <method name="mount_enclosing_volume_finish" symbol="g_file_mount_enclosing_volume_finish">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="location" type="GFile*"/>
+                                       <parameter name="result" type="GAsyncResult*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </method>
                        <method name="mount_mountable" symbol="g_file_mount_mountable">
                                <return-type type="void"/>
                                <parameters>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="attribute" type="char*"/>
-                                       <parameter name="value" type="GFileAttributeValue*"/>
+                                       <parameter name="type" type="GFileAttributeType"/>
+                                       <parameter name="value_p" type="gpointer"/>
                                        <parameter name="flags" type="GFileQueryInfoFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="error" type="GError**"/>
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                        <parameter name="file2" type="GFile*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="find_enclosing_volume">
-                               <return-type type="GVolume*"/>
+                       <vfunc name="find_enclosing_mount">
+                               <return-type type="GMount*"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="find_enclosing_volume_async">
+                       <vfunc name="find_enclosing_mount_async">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="find_enclosing_volume_finish">
-                               <return-type type="GVolume*"/>
+                       <vfunc name="find_enclosing_mount_finish">
+                               <return-type type="GMount*"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="res" type="GAsyncResult*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="mount_for_location">
+                       <vfunc name="mount_enclosing_volume">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="location" type="GFile*"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="mount_for_location_finish">
+                       <vfunc name="mount_enclosing_volume_finish">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="location" type="GFile*"/>
                                        <parameter name="error" type="GError**"/>
                                </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**"/>
-                               </parameters>
-                       </vfunc>
                        <vfunc name="read_async">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="read_fn">
+                               <return-type type="GFileInputStream*"/>
+                               <parameters>
+                                       <parameter name="file" type="GFile*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </vfunc>
                        <vfunc name="replace">
                                <return-type type="GFileOutputStream*"/>
                                <parameters>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
                                        <parameter name="attribute" type="char*"/>
-                                       <parameter name="value" type="GFileAttributeValue*"/>
+                                       <parameter name="type" type="GFileAttributeType"/>
+                                       <parameter name="value_p" type="gpointer"/>
                                        <parameter name="flags" type="GFileQueryInfoFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="error" type="GError**"/>
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="file" type="GFile*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </vfunc>
                </interface>
+               <interface name="GMount" type-name="GMount" get-type="g_mount_get_type">
+                       <requires>
+                               <interface name="GObject"/>
+                       </requires>
+                       <method name="can_eject" symbol="g_mount_can_eject">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </method>
+                       <method name="can_unmount" symbol="g_mount_can_unmount">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </method>
+                       <method name="eject" symbol="g_mount_eject">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="callback" type="GAsyncReadyCallback"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                               </parameters>
+                       </method>
+                       <method name="eject_finish" symbol="g_mount_eject_finish">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="result" type="GAsyncResult*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </method>
+                       <method name="get_drive" symbol="g_mount_get_drive">
+                               <return-type type="GDrive*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_icon" symbol="g_mount_get_icon">
+                               <return-type type="GIcon*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_name" symbol="g_mount_get_name">
+                               <return-type type="char*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_root" symbol="g_mount_get_root">
+                               <return-type type="GFile*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_uuid" symbol="g_mount_get_uuid">
+                               <return-type type="char*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_volume" symbol="g_mount_get_volume">
+                               <return-type type="GVolume*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </method>
+                       <method name="remount" symbol="g_mount_remount">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="mount_operation" type="GMountOperation*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="callback" type="GAsyncReadyCallback"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                               </parameters>
+                       </method>
+                       <method name="remount_finish" symbol="g_mount_remount_finish">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="result" type="GAsyncResult*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </method>
+                       <method name="unmount" symbol="g_mount_unmount">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="callback" type="GAsyncReadyCallback"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                               </parameters>
+                       </method>
+                       <method name="unmount_finish" symbol="g_mount_unmount_finish">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="result" type="GAsyncResult*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </method>
+                       <signal name="changed" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </signal>
+                       <signal name="unmounted" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </signal>
+                       <vfunc name="can_eject">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="can_unmount">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="eject">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="callback" type="GAsyncReadyCallback"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="eject_finish">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="result" type="GAsyncResult*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="get_drive">
+                               <return-type type="GDrive*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="get_icon">
+                               <return-type type="GIcon*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="get_name">
+                               <return-type type="char*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="get_root">
+                               <return-type type="GFile*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="get_uuid">
+                               <return-type type="char*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="get_volume">
+                               <return-type type="GVolume*"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="remount">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="mount_operation" type="GMountOperation*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="callback" type="GAsyncReadyCallback"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="remount_finish">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="result" type="GAsyncResult*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="unmount">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="callback" type="GAsyncReadyCallback"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="unmount_finish">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="mount" type="GMount*"/>
+                                       <parameter name="result" type="GAsyncResult*"/>
+                                       <parameter name="error" type="GError**"/>
+                               </parameters>
+                       </vfunc>
+               </interface>
                <interface name="GSeekable" type-name="GSeekable" get-type="g_seekable_get_type">
                        <requires>
                                <interface name="GObject"/>
                                        <parameter name="seekable" type="GSeekable*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="truncate">
+                       <vfunc name="truncate_fn">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="seekable" type="GSeekable*"/>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </method>
-                       <method name="can_unmount" symbol="g_volume_can_unmount">
+                       <method name="can_mount" symbol="g_volume_can_mount">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </method>
+                       <method name="get_mount" symbol="g_volume_get_mount">
+                               <return-type type="GMount*"/>
+                               <parameters>
+                                       <parameter name="volume" type="GVolume*"/>
+                               </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_root" symbol="g_volume_get_root">
-                               <return-type type="GFile*"/>
+                       <method name="get_uuid" symbol="g_volume_get_uuid">
+                               <return-type type="char*"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </method>
-                       <method name="unmount" symbol="g_volume_unmount">
+                       <method name="mount" symbol="g_volume_mount">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
+                                       <parameter name="mount_operation" type="GMountOperation*"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </method>
-                       <method name="unmount_finish" symbol="g_volume_unmount_finish">
+                       <method name="mount_finish" symbol="g_volume_mount_finish">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </signal>
+                       <signal name="removed" when="LAST">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="volume" type="GVolume*"/>
+                               </parameters>
+                       </signal>
                        <vfunc name="can_eject">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="can_unmount">
+                       <vfunc name="can_mount">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
+                                       <parameter name="flags" type="GMountUnmountFlags"/>
                                        <parameter name="cancellable" type="GCancellable*"/>
                                        <parameter name="callback" type="GAsyncReadyCallback"/>
                                        <parameter name="user_data" type="gpointer"/>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="get_name">
-                               <return-type type="char*"/>
+                       <vfunc name="get_mount">
+                               <return-type type="GMount*"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="get_root">
-                               <return-type type="GFile*"/>
+                       <vfunc name="get_name">
+                               <return-type type="char*"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="unmount">
-                               <return-type type="void"/>
+                       <vfunc name="get_uuid">
+                               <return-type type="char*"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
-                                       <parameter name="cancellable" type="GCancellable*"/>
-                                       <parameter name="callback" type="GAsyncReadyCallback"/>
-                                       <parameter name="user_data" type="gpointer"/>
                                </parameters>
                        </vfunc>
-                       <vfunc name="unmount_finish">
+                       <vfunc name="mount_finish">
                                <return-type type="gboolean"/>
                                <parameters>
                                        <parameter name="volume" type="GVolume*"/>
                                        <parameter name="error" type="GError**"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="mount_fn">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="volume" type="GVolume*"/>
+                                       <parameter name="mount_operation" type="GMountOperation*"/>
+                                       <parameter name="cancellable" type="GCancellable*"/>
+                                       <parameter name="callback" type="GAsyncReadyCallback"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                               </parameters>
+                       </vfunc>
                </interface>
-               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE" type="char*" value="access:can_delete"/>
-               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE" type="char*" value="access:can_execute"/>
-               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_READ" type="char*" value="access:can_read"/>
-               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME" type="char*" value="access:can_rename"/>
-               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH" type="char*" value="access:can_trash"/>
-               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE" type="char*" value="access:can_write"/>
-               <constant name="G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE" type="char*" value="dos:is_archive"/>
-               <constant name="G_FILE_ATTRIBUTE_DOS_IS_SYSTEM" type="char*" value="dos:is_system"/>
-               <constant name="G_FILE_ATTRIBUTE_ETAG_VALUE" type="char*" value="etag:value"/>
-               <constant name="G_FILE_ATTRIBUTE_FS_FREE" type="char*" value="fs:free"/>
-               <constant name="G_FILE_ATTRIBUTE_FS_READONLY" type="char*" value="fs:readonly"/>
-               <constant name="G_FILE_ATTRIBUTE_FS_SIZE" type="char*" value="fs:size"/>
-               <constant name="G_FILE_ATTRIBUTE_FS_TYPE" type="char*" value="fs:type"/>
-               <constant name="G_FILE_ATTRIBUTE_GVFS_BACKEND" type="char*" value="gvfs:backend"/>
-               <constant name="G_FILE_ATTRIBUTE_ID_FILE" type="char*" value="id:file"/>
-               <constant name="G_FILE_ATTRIBUTE_ID_FS" type="char*" value="id:fs"/>
-               <constant name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT" type="char*" value="mountable:can_eject"/>
-               <constant name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT" type="char*" value="mountable:can_mount"/>
-               <constant name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT" type="char*" value="mountable:can_unmount"/>
-               <constant name="G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI" type="char*" value="mountable:hal_udi"/>
-               <constant name="G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE" type="char*" value="mountable:unix_device"/>
-               <constant name="G_FILE_ATTRIBUTE_OWNER_GROUP" type="char*" value="owner:group"/>
-               <constant name="G_FILE_ATTRIBUTE_OWNER_USER" type="char*" value="owner:user"/>
-               <constant name="G_FILE_ATTRIBUTE_OWNER_USER_REAL" type="char*" value="owner:user_real"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_CONTENT_TYPE" type="char*" value="std:content_type"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_DISPLAY_NAME" type="char*" value="std:display_name"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_EDIT_NAME" type="char*" value="std:edit_name"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_FAST_CONTENT_TYPE" type="char*" value="std:fast_content_type"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_ICON" type="char*" value="std:icon"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_IS_BACKUP" type="char*" value="std:is_backup"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_IS_HIDDEN" type="char*" value="std:is_hidden"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_IS_SYMLINK" type="char*" value="std:is_symlink"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_IS_VIRTUAL" type="char*" value="std:is_virtual"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_NAME" type="char*" value="std:name"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_SIZE" type="char*" value="std:size"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_SORT_ORDER" type="char*" value="std:sort_order"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET" type="char*" value="std:symlink_target"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_TARGET_URI" type="char*" value="std:target_uri"/>
-               <constant name="G_FILE_ATTRIBUTE_STD_TYPE" type="char*" value="std:type"/>
-               <constant name="G_FILE_ATTRIBUTE_THUMBNAILING_FAILED" type="char*" value="thumbnail:failed"/>
-               <constant name="G_FILE_ATTRIBUTE_THUMBNAIL_PATH" type="char*" value="thumbnail:path"/>
-               <constant name="G_FILE_ATTRIBUTE_TIME_ACCESS" type="char*" value="time:access"/>
-               <constant name="G_FILE_ATTRIBUTE_TIME_ACCESS_USEC" type="char*" value="time:access_usec"/>
-               <constant name="G_FILE_ATTRIBUTE_TIME_CHANGED" type="char*" value="time:changed"/>
-               <constant name="G_FILE_ATTRIBUTE_TIME_CHANGED_USEC" type="char*" value="time:changed_usec"/>
-               <constant name="G_FILE_ATTRIBUTE_TIME_CREATED" type="char*" value="time:created"/>
-               <constant name="G_FILE_ATTRIBUTE_TIME_CREATED_USEC" type="char*" value="time:created_usec"/>
-               <constant name="G_FILE_ATTRIBUTE_TIME_MODIFIED" type="char*" value="time:modified"/>
-               <constant name="G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC" type="char*" value="time:modified_usec"/>
-               <constant name="G_FILE_ATTRIBUTE_UNIX_BLOCKS" type="char*" value="unix:blocks"/>
-               <constant name="G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE" type="char*" value="unix:block_size"/>
-               <constant name="G_FILE_ATTRIBUTE_UNIX_DEVICE" type="char*" value="unix:device"/>
-               <constant name="G_FILE_ATTRIBUTE_UNIX_GID" type="char*" value="unix:gid"/>
-               <constant name="G_FILE_ATTRIBUTE_UNIX_INODE" type="char*" value="unix:inode"/>
-               <constant name="G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT" type="char*" value="unix:is_mountpoint"/>
-               <constant name="G_FILE_ATTRIBUTE_UNIX_MODE" type="char*" value="unix:mode"/>
-               <constant name="G_FILE_ATTRIBUTE_UNIX_NLINK" type="char*" value="unix:nlink"/>
-               <constant name="G_FILE_ATTRIBUTE_UNIX_RDEV" type="char*" value="unix:rdev"/>
-               <constant name="G_FILE_ATTRIBUTE_UNIX_UID" type="char*" value="unix:uid"/>
-               <constant name="G_URI_RESERVED_CHARS_GENERIC_DELIMITERS" type="char*" value=":/?#[]@"/>
-               <constant name="G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS" type="char*" value="!$&amp;&apos;()*+,;="/>
+               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE" type="char*" value="access::can-delete"/>
+               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE" type="char*" value="access::can-execute"/>
+               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_READ" type="char*" value="access::can-read"/>
+               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME" type="char*" value="access::can-rename"/>
+               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH" type="char*" value="access::can-trash"/>
+               <constant name="G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE" type="char*" value="access::can-write"/>
+               <constant name="G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE" type="char*" value="dos::is-archive"/>
+               <constant name="G_FILE_ATTRIBUTE_DOS_IS_SYSTEM" type="char*" value="dos::is-system"/>
+               <constant name="G_FILE_ATTRIBUTE_ETAG_VALUE" type="char*" value="etag::value"/>
+               <constant name="G_FILE_ATTRIBUTE_FILESYSTEM_FREE" type="char*" value="filesystem::free"/>
+               <constant name="G_FILE_ATTRIBUTE_FILESYSTEM_READONLY" type="char*" value="filesystem::readonly"/>
+               <constant name="G_FILE_ATTRIBUTE_FILESYSTEM_SIZE" type="char*" value="filesystem::size"/>
+               <constant name="G_FILE_ATTRIBUTE_FILESYSTEM_TYPE" type="char*" value="filesystem::type"/>
+               <constant name="G_FILE_ATTRIBUTE_GVFS_BACKEND" type="char*" value="gvfs::backend"/>
+               <constant name="G_FILE_ATTRIBUTE_ID_FILE" type="char*" value="id::file"/>
+               <constant name="G_FILE_ATTRIBUTE_ID_FILESYSTEM" type="char*" value="id::filesystem"/>
+               <constant name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT" type="char*" value="mountable::can-eject"/>
+               <constant name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT" type="char*" value="mountable::can-mount"/>
+               <constant name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT" type="char*" value="mountable::can-unmount"/>
+               <constant name="G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI" type="char*" value="mountable::hal-udi"/>
+               <constant name="G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE" type="char*" value="mountable::unix-device"/>
+               <constant name="G_FILE_ATTRIBUTE_OWNER_GROUP" type="char*" value="owner::group"/>
+               <constant name="G_FILE_ATTRIBUTE_OWNER_USER" type="char*" value="owner::user"/>
+               <constant name="G_FILE_ATTRIBUTE_OWNER_USER_REAL" type="char*" value="owner::user-real"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE" type="char*" value="standard::content-type"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_COPY_NAME" type="char*" value="standard::copy-name"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME" type="char*" value="standard::display-name"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME" type="char*" value="standard::edit-name"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE" type="char*" value="standard::fast-content-type"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_ICON" type="char*" value="standard::icon"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP" type="char*" value="standard::is-backup"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN" type="char*" value="standard::is-hidden"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK" type="char*" value="standard::is-symlink"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL" type="char*" value="standard::is-virtual"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_NAME" type="char*" value="standard::name"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_SIZE" type="char*" value="standard::size"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER" type="char*" value="standard::sort-order"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET" type="char*" value="standard::symlink-target"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_TARGET_URI" type="char*" value="standard::target-uri"/>
+               <constant name="G_FILE_ATTRIBUTE_STANDARD_TYPE" type="char*" value="standard::type"/>
+               <constant name="G_FILE_ATTRIBUTE_THUMBNAILING_FAILED" type="char*" value="thumbnail::failed"/>
+               <constant name="G_FILE_ATTRIBUTE_THUMBNAIL_PATH" type="char*" value="thumbnail::path"/>
+               <constant name="G_FILE_ATTRIBUTE_TIME_ACCESS" type="char*" value="time::access"/>
+               <constant name="G_FILE_ATTRIBUTE_TIME_ACCESS_USEC" type="char*" value="time::access-usec"/>
+               <constant name="G_FILE_ATTRIBUTE_TIME_CHANGED" type="char*" value="time::changed"/>
+               <constant name="G_FILE_ATTRIBUTE_TIME_CHANGED_USEC" type="char*" value="time::changed-usec"/>
+               <constant name="G_FILE_ATTRIBUTE_TIME_CREATED" type="char*" value="time::created"/>
+               <constant name="G_FILE_ATTRIBUTE_TIME_CREATED_USEC" type="char*" value="time::created-usec"/>
+               <constant name="G_FILE_ATTRIBUTE_TIME_MODIFIED" type="char*" value="time::modified"/>
+               <constant name="G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC" type="char*" value="time::modified-usec"/>
+               <constant name="G_FILE_ATTRIBUTE_UNIX_BLOCKS" type="char*" value="unix::blocks"/>
+               <constant name="G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE" type="char*" value="unix::block-size"/>
+               <constant name="G_FILE_ATTRIBUTE_UNIX_DEVICE" type="char*" value="unix::device"/>
+               <constant name="G_FILE_ATTRIBUTE_UNIX_GID" type="char*" value="unix::gid"/>
+               <constant name="G_FILE_ATTRIBUTE_UNIX_INODE" type="char*" value="unix::inode"/>
+               <constant name="G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT" type="char*" value="unix::is-mountpoint"/>
+               <constant name="G_FILE_ATTRIBUTE_UNIX_MODE" type="char*" value="unix::mode"/>
+               <constant name="G_FILE_ATTRIBUTE_UNIX_NLINK" type="char*" value="unix::nlink"/>
+               <constant name="G_FILE_ATTRIBUTE_UNIX_RDEV" type="char*" value="unix::rdev"/>
+               <constant name="G_FILE_ATTRIBUTE_UNIX_UID" type="char*" value="unix::uid"/>
        </namespace>
 </api>
index a5cc7e7..19adae3 100644 (file)
@@ -1,44 +1,6 @@
-GLib cprefix="G" lower_case_cprefix="g_" cheader_filename="gio/gvfs.h"
-GAppInfo cheader_filename="gio/gappinfo.h"
+GLib cprefix="G" lower_case_cprefix="g_" cheader_filename="gio/gio.h"
 g_app_info_launch.envp is_array="1"
 g_app_info_launch_uris.envp is_array="1"
-GBufferedInputStream cheader_filename="gio/gbufferedinputstream.h"
-GBufferedOutputStream cheader_filename="gio/gbufferedoutputstream.h"
-GCancellable cheader_filename="gio/gcancellable.h"
-GDataInputStream cheader_filename="gio/gdatainputstream.h"
-GDataOutputStream cheader_filename="gio/gdataoutputstream.h"
-GDataStreamByteOrder cheader_filename="gio/gdatainputstream.h"
-GDirectoryMonitor cheader_filename="gio/gdirectorymonitor.h"
-GDummyFile cheader_filename="gio/gdummyfile.h"
-GFile cheader_filename="gio/gfile.h"
-GFileAttributeInfo cheader_filename="gio/gfileattribute.h"
-GFileAttributeInfoList cheader_filename="gio/gfileattribute.h"
-GFileAttributeMatcher cheader_filename="gio/gfileattribute.h"
-GFileAttributeValue cheader_filename="gio/gfileattribute.h"
-GFileEnumerator cheader_filename="gio/gfileenumerator.h"
-GFileIcon cheader_filename="gio/gfileicon.h"
-GFileInfo cheader_filename="gio/gfileinfo.h"
-GFileInputStream cheader_filename="gio/gfileinputstream.h"
-GFileMonitor cheader_filename="gio/gfilemonitor.h"
-GFilenameCompleter cheader_filename="gio/gfilenamecompleter.h"
-GFileOutputStream cheader_filename="gio/gfileoutputstream.h"
-GFilterInputStream cheader_filename="gio/gfilterinputstream.h"
-GFilterOutputStream cheader_filename="gio/gfilteroutputstream.h"
-GIcon cheader_filename="gio/gicon.h"
-GInputStream cheader_filename="gio/ginputstream.h"
-GIOJob cheader_filename="gio/gioscheduler.h"
-GIOModule cheader_filename="gio/giomodule.h"
-GMemoryInputStream cheader_filename="gio/gmemoryinputstream.h"
-GMemoryOutputStream cheader_filename="gio/gmemoryoutputstream.h"
-GMountOperation cheader_filename="gio/gmountoperation.h"
 GMountOperation::reply has_emitter="1"
-GOutputStream cheader_filename="gio/goutputstream.h"
-GSeekable cheader_filename="gio/gseekable.h"
-GSimpleAsyncResult cheader_filename="gio/gsimpleasyncresult.h"
-GSocketInputStream cheader_filename="gio/gsocketinputstream.h"
-GSocketOutputStream cheader_filename="gio/gsocketoutputstream.h"
-GThemedIcon cheader_filename="gio/gthemedicon.h"
 g_themed_icon_new_from_names.iconnames is_array="1"
-GVolume cheader_filename="gio/gvolume.h"
-GVolumeMonitor cheader_filename="gio/gvolumemonitor.h"