diff --git a/ChangeLog b/ChangeLog
index 3b5fe1e95862050eb0834aa38d9d29ea3d5ec980..8e8a050de823b59fdd5f202860a5941fceadda0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-09  Jürg Billeter  <j@bitron.ch>
+
+	* vapi/packages/gio-2.0/: renamed from gio-standalone and updated to
+	  current svn trunk
+	* vapi/gio-2.0.vala: regenerated
+	* vapi/Makefile.am: updated
+
 2007-10-08  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valaparser.vala, compiler/valacompiler.vala: use .vapi as file
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 092b3c491db599e613b9d5ea4ca9790ad79f1029..aec54e7855de2c239a22ea0ecf246376f8e7c5bc 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -18,7 +18,7 @@ dist_vapi_DATA = \
 	glib-2.0.vala \
 	gdk-2.0.deps \
 	gdk-2.0.vala \
-	gio-standalone.vala \
+	gio-2.0.vala \
 	gnome-desktop-2.0.vala \
 	gnome-vfs-2.0.vala \
 	gstreamer-0.10.vala \
diff --git a/vapi/gio-standalone.vala b/vapi/gio-2.0.vala
similarity index 81%
rename from vapi/gio-standalone.vala
rename to vapi/gio-2.0.vala
index b48d142d14c7c413907e1d97dd529282abd2eb7b..dbdda954f8dc9b194ba1938b2c4d97dc750cbe58 100644
--- a/vapi/gio-standalone.vala
+++ b/vapi/gio-2.0.vala
@@ -1,7 +1,12 @@
-/* gio-standalone.vala generated by lt-vapigen, do not modify. */
+/* gio-2.0.vala generated by lt-vapigen, do not modify. */
 
 [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")]
 	public enum DataStreamByteOrder {
 		BIG_ENDIAN,
@@ -46,9 +51,10 @@ namespace GLib {
 		NOFOLLOW_SYMLINKS,
 		ALL_METADATA,
 	}
-	[CCode (cprefix = "G_FILE_GET_INFO_NOFOLLOW_", cheader_filename = "gio/gvfs.h")]
-	public enum FileGetInfoFlags {
-		SYMLINKS,
+	[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")]
 	public enum FileMonitorEvent {
@@ -65,6 +71,10 @@ namespace GLib {
 		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")]
 	public enum FileType {
 		UNKNOWN,
@@ -85,7 +95,7 @@ namespace GLib {
 		NOT_EMPTY,
 		NOT_REGULAR_FILE,
 		NOT_SYMBOLIC_LINK,
-		NOT_MOUNTABLE,
+		NOT_MOUNTABLE_FILE,
 		FILENAME_TOO_LONG,
 		INVALID_FILENAME,
 		TOO_MANY_LINKS,
@@ -105,6 +115,7 @@ namespace GLib {
 		WOULD_RECURSE,
 		BUSY,
 		WOULD_BLOCK,
+		HOST_NOT_FOUND,
 	}
 	[CCode (cprefix = "G_PASSWORD_FLAGS_", cheader_filename = "gio/gvfs.h")]
 	public enum PasswordFlags {
@@ -182,19 +193,19 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class DataInputStream : GLib.BufferedInputStream {
-		public uchar get_byte (GLib.Cancellable cancellable) throws GLib.Error;
 		public GLib.DataStreamByteOrder get_byte_order ();
-		public short get_int16 (GLib.Cancellable cancellable) throws GLib.Error;
-		public int get_int32 (GLib.Cancellable cancellable) throws GLib.Error;
-		public int64 get_int64 (GLib.Cancellable cancellable) throws GLib.Error;
-		public weak string get_line (ulong length, GLib.Cancellable cancellable) throws GLib.Error;
 		public GLib.DataStreamNewlineType get_newline_type ();
 		public static GLib.Type get_type ();
-		public ushort get_uint16 (GLib.Cancellable cancellable) throws GLib.Error;
-		public uint get_uint32 (GLib.Cancellable cancellable) throws GLib.Error;
-		public uint64 get_uint64 (GLib.Cancellable cancellable) throws GLib.Error;
-		public weak string get_until (char stop_char, ulong length, GLib.Cancellable cancellable) throws GLib.Error;
 		public DataInputStream (GLib.InputStream base_stream);
+		public uchar read_byte (GLib.Cancellable cancellable) throws GLib.Error;
+		public short read_int16 (GLib.Cancellable cancellable) throws GLib.Error;
+		public int read_int32 (GLib.Cancellable cancellable) throws GLib.Error;
+		public int64 read_int64 (GLib.Cancellable cancellable) throws GLib.Error;
+		public weak string read_line (ulong length, GLib.Cancellable cancellable) throws GLib.Error;
+		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 void set_byte_order (GLib.DataStreamByteOrder order);
 		public void set_newline_type (GLib.DataStreamNewlineType type);
 	}
@@ -216,12 +227,15 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class DesktopAppInfo : GLib.Object, GLib.AppInfo {
+		public bool get_is_hidden ();
 		public static GLib.Type get_type ();
 		public DesktopAppInfo (string desktop_id);
+		public DesktopAppInfo.from_filename (string filename);
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class DirectoryMonitor : GLib.Object {
 		public virtual bool cancel ();
+		public void emit_event (GLib.File child, GLib.File other_file, GLib.FileMonitorEvent event_type);
 		public static GLib.Type get_type ();
 		public bool is_cancelled ();
 		public void set_rate_limit (int limit_msecs);
@@ -272,6 +286,7 @@ namespace GLib {
 		public weak string get_etag ();
 		public GLib.FileType get_file_type ();
 		public weak GLib.Icon get_icon ();
+		public bool get_is_backup ();
 		public bool get_is_hidden ();
 		public bool get_is_symlink ();
 		public void get_modification_time (out GLib.TimeVal result);
@@ -311,16 +326,19 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class FileInputStream : GLib.InputStream, GLib.Seekable {
 		public virtual bool can_seek ();
-		public virtual weak GLib.FileInfo get_file_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
 		public static GLib.Type get_type ();
+		public virtual weak GLib.FileInfo query_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
+		public virtual void query_info_async (string attributes, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+		public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult res) throws GLib.Error;
 		public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable cancellable) throws GLib.Error;
 		public virtual int64 tell ();
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class FileMonitor : GLib.Object {
 		public virtual bool cancel ();
-		public static weak GLib.DirectoryMonitor directory (GLib.File file, GLib.FileMonitorFlags flags);
-		public static weak GLib.FileMonitor file (GLib.File file, GLib.FileMonitorFlags flags);
+		public static weak GLib.DirectoryMonitor directory (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable cancellable);
+		public void emit_event (GLib.File file, GLib.File other_file, GLib.FileMonitorEvent event_type);
+		public static weak GLib.FileMonitor file (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable cancellable);
 		public static GLib.Type get_type ();
 		public bool is_cancelled ();
 		public void set_rate_limit (int limit_msecs);
@@ -330,9 +348,11 @@ namespace GLib {
 	public class FileOutputStream : GLib.OutputStream, GLib.Seekable {
 		public virtual bool can_seek ();
 		public virtual bool can_truncate ();
-		public virtual weak string get_etag (GLib.Cancellable cancellable) throws GLib.Error;
-		public virtual weak GLib.FileInfo get_file_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
+		public virtual weak string get_etag ();
 		public static GLib.Type get_type ();
+		public virtual weak GLib.FileInfo query_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
+		public virtual void query_info_async (string attributes, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+		public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult res) 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;
@@ -381,7 +401,7 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class LocalFileEnumerator : GLib.FileEnumerator {
 		public static GLib.Type get_type ();
-		public LocalFileEnumerator (string filename, string attributes, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public LocalFileEnumerator (string filename, string attributes, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class LocalFileInputStream : GLib.FileInputStream {
@@ -395,10 +415,10 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class LocalFileOutputStream : GLib.FileOutputStream {
-		public static weak GLib.FileOutputStream append (string filename, GLib.Cancellable cancellable) throws GLib.Error;
-		public static weak GLib.FileOutputStream create (string filename, GLib.Cancellable cancellable) throws GLib.Error;
+		public static weak GLib.FileOutputStream append (string filename, GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public static weak GLib.FileOutputStream create (string filename, GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
 		public static GLib.Type get_type ();
-		public static weak GLib.FileOutputStream replace (string filename, string etag, bool make_backup, GLib.Cancellable cancellable) throws GLib.Error;
+		public static weak GLib.FileOutputStream replace (string filename, string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class LocalVfs : GLib.Vfs {
@@ -408,13 +428,17 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gvfs.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 static GLib.Type get_type ();
+		public void set_free_data (bool free_data);
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
 		public weak GLib.ByteArray get_data ();
 		public static GLib.Type get_type ();
 		public MemoryOutputStream (GLib.ByteArray data);
+		public void set_free_on_close (bool free_on_close);
 		public void set_max_size (uint max_size);
 		[NoAccessorMethod]
 		public weak pointer data { get; set construct; }
@@ -560,6 +584,7 @@ namespace GLib {
 		public static weak GLib.Vfs get_local ();
 		public weak string get_name ();
 		public virtual int get_priority ();
+		public weak string get_supported_uri_schemes ();
 		public static GLib.Type get_type ();
 		public virtual weak GLib.File parse_name (string parse_name);
 	}
@@ -654,37 +679,46 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class UnixMount {
-		public weak string mount_path;
-		public weak string device_path;
-		public weak string filesystem_type;
-		public bool is_read_only;
+		public int compare (GLib.UnixMount mount_entry2);
+		public weak string get_device_path ();
+		public weak string get_fs_type ();
+		public weak string get_mount_path ();
+		public GLib.UnixMountType guess_type ();
+		public bool is_readonly ();
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public class UnixMountPoint {
-		public weak string mount_path;
-		public weak string device_path;
-		public weak string filesystem_type;
-		public weak string dev_opt;
-		public bool is_read_only;
-		public bool is_user_mountable;
-		public bool is_loopback;
+		public int compare (GLib.UnixMountPoint mount_point2);
+		public weak string get_device_path ();
+		public weak string get_fs_type ();
+		public weak string get_mount_path ();
+		public GLib.UnixMountType guess_type ();
+		public bool is_loopback ();
+		public bool is_readonly ();
+		public bool is_user_mountable ();
 	}
 	[CCode (cheader_filename = "gio/gvfs.h")]
 	public interface AppInfo {
-		public static weak GLib.AppInfo create_from_commandline (string commandline, string application_name) throws GLib.Error;
+		public abstract bool add_supports_type (string content_type) throws GLib.Error;
+		public abstract bool can_remove_supports_type ();
+		public static weak GLib.AppInfo create_from_commandline (string commandline, string application_name, GLib.AppInfoCreateFlags flags) throws GLib.Error;
 		public abstract weak GLib.AppInfo dup ();
 		public abstract bool equal (GLib.AppInfo appinfo2);
 		public static weak GLib.List get_all ();
 		public static weak GLib.List get_all_for_type (string content_type);
-		public static weak GLib.AppInfo get_default_for_type (string content_type);
-		public abstract weak string get_description ();
+		public static weak GLib.AppInfo get_default_for_type (string content_type, bool must_support_uris);
+		public weak string get_description ();
+		public weak string get_executable ();
 		public abstract weak GLib.Icon get_icon ();
-		public abstract weak string get_name ();
+		public weak string get_id ();
+		public weak string get_name ();
 		public static GLib.Type get_type ();
 		[NoArrayLength]
-		public abstract bool launch (GLib.List filenames, string[] envp) throws GLib.Error;
+		public abstract bool launch (GLib.List files, string[] envp) throws GLib.Error;
 		[NoArrayLength]
 		public abstract bool launch_uris (GLib.List uris, string[] envp) throws GLib.Error;
+		public abstract bool remove_supports_type (string content_type) throws GLib.Error;
+		public abstract bool set_as_default_for_extension (string extension) throws GLib.Error;
 		public abstract bool set_as_default_for_type (string content_type) throws GLib.Error;
 		public abstract bool should_show (string desktop_env);
 		public abstract bool supports_uris ();
@@ -713,36 +747,38 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gfile.h")]
 	public interface File {
-		public abstract weak GLib.FileOutputStream append_to (GLib.Cancellable cancellable) throws GLib.Error;
-		public abstract void append_to_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+		public abstract weak GLib.FileOutputStream append_to (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 abstract weak GLib.FileOutputStream create (GLib.Cancellable cancellable) throws GLib.Error;
-		public abstract void create_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+		public abstract weak GLib.FileOutputStream create (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 bool eject_mountable_finish (GLib.AsyncResult result) throws GLib.Error;
-		public abstract weak GLib.FileEnumerator enumerate_children (string attributes, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) 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 string get_basename ();
 		public weak GLib.File get_child (string name);
 		public abstract weak GLib.File get_child_for_display_name (string display_name) throws GLib.Error;
-		public abstract weak GLib.FileInfo get_filesystem_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
-		public abstract weak GLib.FileInfo get_info (string attributes, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
-		public abstract void get_info_async (string attributes, GLib.FileGetInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-		public abstract weak GLib.FileInfo get_info_finish (GLib.AsyncResult res) throws GLib.Error;
 		public abstract weak GLib.File get_parent ();
 		public abstract weak string get_parse_name ();
 		public abstract weak string get_path ();
+		public abstract weak string get_relative_path (GLib.File descendant);
 		public static GLib.Type get_type ();
 		public abstract weak string get_uri ();
 		public static uint hash (pointer file);
 		public abstract bool is_native ();
-		public bool load_contents (GLib.Cancellable cancellable, out string contents, ulong length) throws GLib.Error;
+		public bool load_contents (GLib.Cancellable cancellable, out string contents, ulong length, out string etag_out) throws GLib.Error;
 		public void load_contents_async (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-		public bool load_contents_finish (GLib.AsyncResult res, out string contents, ulong length) throws GLib.Error;
+		public bool load_contents_finish (GLib.AsyncResult res, out string contents, ulong length, out string etag_out) throws GLib.Error;
+		public void load_partial_contents_async (GLib.Cancellable cancellable, GLib.FileReadMoreCallback read_more_callback, GLib.AsyncReadyCallback callback, pointer user_data);
+		public bool load_partial_contents_finish (GLib.AsyncResult res, out string contents, ulong length, out 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_mountable (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -752,27 +788,35 @@ namespace GLib {
 		public static weak GLib.File new_for_path (string path);
 		public static weak GLib.File new_for_uri (string uri);
 		public static weak GLib.File parse_name (string parse_name);
+		public abstract weak GLib.FileInfo query_filesystem_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
+		public abstract weak GLib.FileInfo query_info (string attributes, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public abstract void query_info_async (string attributes, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+		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 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.Cancellable cancellable) throws GLib.Error;
-		public abstract void replace_async (string etag, bool make_backup, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-		public bool replace_contents (string contents, ulong length, string etag, bool make_backup, GLib.Cancellable cancellable) throws GLib.Error;
-		public void replace_contents_async (string contents, ulong length, string etag, bool make_backup, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-		public bool replace_contents_finish (GLib.AsyncResult res) throws GLib.Error;
+		public abstract weak GLib.FileOutputStream replace (string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public abstract void replace_async (string etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+		public bool replace_contents (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, out string new_etag, GLib.Cancellable cancellable) throws GLib.Error;
+		public void replace_contents_async (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+		public bool replace_contents_finish (GLib.AsyncResult res, out 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 (string relative_path);
-		public abstract bool set_attribute (string attribute, GLib.FileAttributeValue value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
-		public bool set_attribute_byte_string (string attribute, string value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
-		public bool set_attribute_int32 (string attribute, int value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
-		public bool set_attribute_int64 (string attribute, int64 value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
-		public bool set_attribute_string (string attribute, string value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
-		public bool set_attribute_uint32 (string attribute, uint value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
-		public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
-		public abstract bool set_attributes_from_info (GLib.FileInfo info, GLib.FileGetInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public abstract weak GLib.File 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 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;
+		public bool set_attribute_string (string attribute, string value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public bool set_attribute_uint32 (string attribute, uint value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
+		public abstract void set_attributes_async (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
+		public abstract bool set_attributes_finish (GLib.AsyncResult result, GLib.FileInfo info) throws GLib.Error;
+		public abstract bool set_attributes_from_info (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
 		public abstract weak GLib.File set_display_name (string display_name, GLib.Cancellable cancellable) throws GLib.Error;
+		public abstract 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 bool unmount_mountable_finish (GLib.AsyncResult result) throws GLib.Error;
@@ -817,6 +861,7 @@ namespace GLib {
 	public static delegate void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res, pointer user_data);
 	public static delegate bool FDSourceFunc (pointer user_data, GLib.IOCondition condition, int fd);
 	public static delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes, pointer user_data);
+	public static delegate 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 SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
diff --git a/vapi/packages/gio-standalone/gio-standalone.files b/vapi/packages/gio-2.0/gio-2.0.files
similarity index 100%
rename from vapi/packages/gio-standalone/gio-standalone.files
rename to vapi/packages/gio-2.0/gio-2.0.files
diff --git a/vapi/packages/gio-standalone/gio-standalone.gidl b/vapi/packages/gio-2.0/gio-2.0.gidl
similarity index 88%
rename from vapi/packages/gio-standalone/gio-standalone.gidl
rename to vapi/packages/gio-2.0/gio-2.0.gidl
index 4c6e631929a59911dc6ad555f167e413d86bfe94..fdf0d3388410a43c214064ef2f5afbbac6f11539 100644
--- a/vapi/packages/gio-standalone/gio-standalone.gidl
+++ b/vapi/packages/gio-2.0/gio-2.0.gidl
@@ -7,6 +7,10 @@
 
 -->
   <namespace name="GLib">
+    <enum name="GAppInfoCreateFlags" type-name="GAppInfoCreateFlags" type="flags">
+      <member name="G_APP_INFO_CREATE_FLAGS_NONE" value=""/>
+      <member name="G_APP_INFO_CREATE_NEEDS_TERMINAL" value=""/>
+    </enum>
     <enum name="GDataStreamByteOrder" type-name="GDataStreamByteOrder" type="enum">
       <member name="G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN" value=""/>
       <member name="G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN" value=""/>
@@ -45,8 +49,9 @@
       <member name="G_FILE_COPY_NOFOLLOW_SYMLINKS" value=""/>
       <member name="G_FILE_COPY_ALL_METADATA" value=""/>
     </enum>
-    <enum name="GFileGetInfoFlags" type-name="GFileGetInfoFlags" type="flags">
-      <member name="G_FILE_GET_INFO_NOFOLLOW_SYMLINKS" value="(1&lt;&lt;0)"/>
+    <enum name="GFileCreateFlags" type-name="GFileCreateFlags" type="flags">
+      <member name="G_FILE_CREATE_FLAGS_NONE" value=""/>
+      <member name="G_FILE_CREATE_FLAGS_PRIVATE" value=""/>
     </enum>
     <enum name="GFileMonitorEvent" type-name="GFileMonitorEvent" type="enum">
       <member name="G_FILE_MONITOR_EVENT_CHANGED" value=""/>
@@ -61,6 +66,9 @@
       <member name="G_FILE_MONITOR_FLAGS_NONE" value=""/>
       <member name="G_FILE_MONITOR_FLAGS_MONITOR_MOUNTS" value=""/>
     </enum>
+    <enum name="GFileQueryInfoFlags" type-name="GFileQueryInfoFlags" type="flags">
+      <member name="G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS" value="(1&lt;&lt;0)"/>
+    </enum>
     <enum name="GFileType" type-name="GFileType" type="enum">
       <member name="G_FILE_TYPE_UNKNOWN" value=""/>
       <member name="G_FILE_TYPE_REGULAR" value=""/>
@@ -79,7 +87,7 @@
       <member name="G_IO_ERROR_NOT_EMPTY" value=""/>
       <member name="G_IO_ERROR_NOT_REGULAR_FILE" value=""/>
       <member name="G_IO_ERROR_NOT_SYMBOLIC_LINK" value=""/>
-      <member name="G_IO_ERROR_NOT_MOUNTABLE" value=""/>
+      <member name="G_IO_ERROR_NOT_MOUNTABLE_FILE" value=""/>
       <member name="G_IO_ERROR_FILENAME_TOO_LONG" value=""/>
       <member name="G_IO_ERROR_INVALID_FILENAME" value=""/>
       <member name="G_IO_ERROR_TOO_MANY_LINKS" value=""/>
@@ -99,6 +107,7 @@
       <member name="G_IO_ERROR_WOULD_RECURSE" value=""/>
       <member name="G_IO_ERROR_BUSY" value=""/>
       <member name="G_IO_ERROR_WOULD_BLOCK" value=""/>
+      <member name="G_IO_ERROR_HOST_NOT_FOUND" value=""/>
     </enum>
     <enum name="GPasswordFlags" type-name="GPasswordFlags" type="flags">
       <member name="G_PASSWORD_FLAGS_NEED_PASSWORD" value=""/>
@@ -151,6 +160,14 @@
         <parameter type="gpointer" name="user_data"/>
       </parameters>
     </callback>
+    <callback name="GFileReadMoreCallback" type-name="GFileReadMoreCallback">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter type="const-char*" name="file_contents"/>
+        <parameter type="goffset" name="file_size"/>
+        <parameter type="gpointer" name="callback_data"/>
+      </parameters>
+    </callback>
     <callback name="GIODataFunc" type-name="GIODataFunc">
       <return-type type="void"/>
       <parameters>
@@ -193,18 +210,6 @@
           <parameter type="GAppInfo*" name="appinfo2"/>
         </parameters>
       </vfunc>
-      <vfunc name="get_name">
-        <return-type type="char*"/>
-        <parameters>
-          <parameter type="GAppInfo*" name="appinfo"/>
-        </parameters>
-      </vfunc>
-      <vfunc name="get_description">
-        <return-type type="char*"/>
-        <parameters>
-          <parameter type="GAppInfo*" name="appinfo"/>
-        </parameters>
-      </vfunc>
       <vfunc name="get_icon">
         <return-type type="GIcon*"/>
         <parameters>
@@ -256,11 +261,56 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
+      <vfunc name="set_as_default_for_extension">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="const-char*" name="extension"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="add_supports_type">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="const-char*" name="content_type"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="can_remove_supports_type">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GAppInfo*" name="appinfo"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="remove_supports_type">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="const-char*" name="content_type"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <method name="add_supports_type" symbol="g_app_info_add_supports_type">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="const-char*" name="content_type"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="can_remove_supports_type" symbol="g_app_info_can_remove_supports_type">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GAppInfo*" name="appinfo"/>
+        </parameters>
+      </method>
       <method name="create_from_commandline" symbol="g_app_info_create_from_commandline">
         <return-type type="GAppInfo*"/>
         <parameters>
           <parameter type="const-char*" name="commandline"/>
           <parameter type="const-char*" name="application_name"/>
+          <parameter type="GAppInfoCreateFlags" name="flags"/>
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
@@ -290,10 +340,17 @@
         <return-type type="GAppInfo*"/>
         <parameters>
           <parameter type="const-char*" name="content_type"/>
+          <parameter type="gboolean" name="must_support_uris"/>
         </parameters>
       </method>
       <method name="get_description" symbol="g_app_info_get_description">
-        <return-type type="char*"/>
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GAppInfo*" name="appinfo"/>
+        </parameters>
+      </method>
+      <method name="get_executable" symbol="g_app_info_get_executable">
+        <return-type type="const-char*"/>
         <parameters>
           <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
@@ -304,8 +361,14 @@
           <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
       </method>
+      <method name="get_id" symbol="g_app_info_get_id">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GAppInfo*" name="appinfo"/>
+        </parameters>
+      </method>
       <method name="get_name" symbol="g_app_info_get_name">
-        <return-type type="char*"/>
+        <return-type type="const-char*"/>
         <parameters>
           <parameter type="GAppInfo*" name="appinfo"/>
         </parameters>
@@ -317,7 +380,7 @@
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GAppInfo*" name="appinfo"/>
-          <parameter type="GList*" name="filenames"/>
+          <parameter type="GList*" name="files"/>
           <parameter type="char**" name="envp"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -331,6 +394,22 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
+      <method name="remove_supports_type" symbol="g_app_info_remove_supports_type">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="const-char*" name="content_type"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="set_as_default_for_extension" symbol="g_app_info_set_as_default_for_extension">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GAppInfo*" name="appinfo"/>
+          <parameter type="const-char*" name="extension"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
       <method name="set_as_default_for_type" symbol="g_app_info_set_as_default_for_type">
         <return-type type="gboolean"/>
         <parameters>
@@ -593,7 +672,21 @@
           <parameter type="GFile*" name="file"/>
         </parameters>
       </vfunc>
-      <vfunc name="resolve_relative">
+      <vfunc name="contains_file">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="parent"/>
+          <parameter type="GFile*" name="descendant"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="get_relative_path">
+        <return-type type="char*"/>
+        <parameters>
+          <parameter type="GFile*" name="parent"/>
+          <parameter type="GFile*" name="descendant"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="resolve_relative_path">
         <return-type type="GFile*"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
@@ -613,34 +706,54 @@
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attributes"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
-      <vfunc name="get_info">
+      <vfunc name="enumerate_children_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="enumerate_children_finish">
+        <return-type type="GFileEnumerator*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="query_info">
         <return-type type="GFileInfo*"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attributes"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
-      <vfunc name="get_info_async">
+      <vfunc name="query_info_async">
         <return-type type="void"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attributes"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GAsyncReadyCallback" name="callback"/>
           <parameter type="gpointer" name="user_data"/>
         </parameters>
       </vfunc>
-      <vfunc name="get_info_finish">
+      <vfunc name="query_info_finish">
         <return-type type="GFileInfo*"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
@@ -648,7 +761,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
-      <vfunc name="get_filesystem_info">
+      <vfunc name="query_filesystem_info">
         <return-type type="GFileInfo*"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
@@ -666,6 +779,25 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
+      <vfunc name="set_display_name_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="display_name"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="set_display_name_finish">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
       <vfunc name="query_settable_attributes">
         <return-type type="GFileAttributeInfoList*"/>
         <parameters>
@@ -688,7 +820,7 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attribute"/>
           <parameter type="const-GFileAttributeValue*" name="value"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -698,8 +830,29 @@
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="GFileInfo*" name="info"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="set_attributes_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
+          <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="set_attributes_finish">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GFileInfo**" name="info"/>
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
@@ -715,6 +868,7 @@
         <return-type type="GFileOutputStream*"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -723,6 +877,7 @@
         <return-type type="GFileOutputStream*"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -733,6 +888,7 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="etag"/>
           <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -816,6 +972,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GAsyncReadyCallback" name="callback"/>
@@ -834,6 +991,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GAsyncReadyCallback" name="callback"/>
@@ -854,6 +1012,7 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="etag"/>
           <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GAsyncReadyCallback" name="callback"/>
@@ -943,6 +1102,7 @@
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="GFileMonitorFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
         </parameters>
       </vfunc>
       <vfunc name="monitor_file">
@@ -950,12 +1110,14 @@
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="GFileMonitorFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
         </parameters>
       </vfunc>
       <method name="append_to" symbol="g_file_append_to">
         <return-type type="GFileOutputStream*"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -964,6 +1126,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GAsyncReadyCallback" name="callback"/>
@@ -978,6 +1141,13 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
+      <method name="contains_file" symbol="g_file_contains_file">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="parent"/>
+          <parameter type="GFile*" name="descendant"/>
+        </parameters>
+      </method>
       <method name="copy" symbol="g_file_copy">
         <return-type type="gboolean"/>
         <parameters>
@@ -994,6 +1164,7 @@
         <return-type type="GFileOutputStream*"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -1002,6 +1173,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GAsyncReadyCallback" name="callback"/>
@@ -1052,8 +1224,28 @@
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attributes"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="enumerate_children_async" symbol="g_file_enumerate_children_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
+          <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="enumerate_children_finish" symbol="g_file_enumerate_children_finish">
+        <return-type type="GFileEnumerator*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
@@ -1085,45 +1277,6 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_filesystem_info" symbol="g_file_get_filesystem_info">
-        <return-type type="GFileInfo*"/>
-        <parameters>
-          <parameter type="GFile*" name="file"/>
-          <parameter type="const-char*" name="attributes"/>
-          <parameter type="GCancellable*" name="cancellable"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="get_info" symbol="g_file_get_info">
-        <return-type type="GFileInfo*"/>
-        <parameters>
-          <parameter type="GFile*" name="file"/>
-          <parameter type="const-char*" name="attributes"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
-          <parameter type="GCancellable*" name="cancellable"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
-      <method name="get_info_async" symbol="g_file_get_info_async">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GFile*" name="file"/>
-          <parameter type="const-char*" name="attributes"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
-          <parameter type="int" name="io_priority"/>
-          <parameter type="GCancellable*" name="cancellable"/>
-          <parameter type="GAsyncReadyCallback" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
-        </parameters>
-      </method>
-      <method name="get_info_finish" symbol="g_file_get_info_finish">
-        <return-type type="GFileInfo*"/>
-        <parameters>
-          <parameter type="GFile*" name="file"/>
-          <parameter type="GAsyncResult*" name="res"/>
-          <parameter type="GError**" name="error"/>
-        </parameters>
-      </method>
       <method name="get_parent" symbol="g_file_get_parent">
         <return-type type="GFile*"/>
         <parameters>
@@ -1142,6 +1295,13 @@
           <parameter type="GFile*" name="file"/>
         </parameters>
       </method>
+      <method name="get_relative_path" symbol="g_file_get_relative_path">
+        <return-type type="char*"/>
+        <parameters>
+          <parameter type="GFile*" name="parent"/>
+          <parameter type="GFile*" name="descendant"/>
+        </parameters>
+      </method>
       <method name="get_type" symbol="g_file_get_type">
         <return-type type="GType"/>
       </method>
@@ -1170,6 +1330,7 @@
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="char**" name="contents"/>
           <parameter type="gsize*" name="length"/>
+          <parameter type="char**" name="etag_out"/>
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
@@ -1189,6 +1350,28 @@
           <parameter type="GAsyncResult*" name="res"/>
           <parameter type="char**" name="contents"/>
           <parameter type="gsize*" name="length"/>
+          <parameter type="char**" name="etag_out"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="load_partial_contents_async" symbol="g_file_load_partial_contents_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GFileReadMoreCallback" name="read_more_callback"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="load_partial_contents_finish" symbol="g_file_load_partial_contents_finish">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="char**" name="contents"/>
+          <parameter type="gsize*" name="length"/>
+          <parameter type="char**" name="etag_out"/>
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
@@ -1263,6 +1446,45 @@
           <parameter type="const-char*" name="parse_name"/>
         </parameters>
       </method>
+      <method name="query_filesystem_info" symbol="g_file_query_filesystem_info">
+        <return-type type="GFileInfo*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="query_info" symbol="g_file_query_info">
+        <return-type type="GFileInfo*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="query_info_async" symbol="g_file_query_info_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attributes"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="query_info_finish" symbol="g_file_query_info_finish">
+        <return-type type="GFileInfo*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
       <method name="query_settable_attributes" symbol="g_file_query_settable_attributes">
         <return-type type="GFileAttributeInfoList*"/>
         <parameters>
@@ -1311,6 +1533,7 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="etag"/>
           <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -1321,6 +1544,7 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="etag"/>
           <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GAsyncReadyCallback" name="callback"/>
@@ -1335,6 +1559,8 @@
           <parameter type="gsize" name="length"/>
           <parameter type="const-char*" name="etag"/>
           <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
+          <parameter type="char**" name="new_etag"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -1347,6 +1573,7 @@
           <parameter type="gsize" name="length"/>
           <parameter type="const-char*" name="etag"/>
           <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GAsyncReadyCallback" name="callback"/>
           <parameter type="gpointer" name="user_data"/>
@@ -1357,6 +1584,7 @@
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="char**" name="new_etag"/>
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
@@ -1368,7 +1596,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="resolve_relative" symbol="g_file_resolve_relative">
+      <method name="resolve_relative_path" symbol="g_file_resolve_relative_path">
         <return-type type="GFile*"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
@@ -1381,7 +1609,7 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attribute"/>
           <parameter type="const-GFileAttributeValue*" name="value"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -1392,7 +1620,7 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attribute"/>
           <parameter type="const-char*" name="value"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -1403,7 +1631,7 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attribute"/>
           <parameter type="gint32" name="value"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -1414,7 +1642,7 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attribute"/>
           <parameter type="gint64" name="value"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -1425,7 +1653,7 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attribute"/>
           <parameter type="const-char*" name="value"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -1436,19 +1664,40 @@
           <parameter type="GFile*" name="file"/>
           <parameter type="const-char*" name="attribute"/>
           <parameter type="guint32" name="value"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="set_attribute_uint64" symbol="g_file_set_attribute_uint64">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="attribute"/>
+          <parameter type="guint64" name="value"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
+      <method name="set_attributes_async" symbol="g_file_set_attributes_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GFileInfo*" name="info"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
+          <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
-          <parameter type="GError**" name="error"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
-      <method name="set_attribute_uint64" symbol="g_file_set_attribute_uint64">
+      <method name="set_attributes_finish" symbol="g_file_set_attributes_finish">
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GFile*" name="file"/>
-          <parameter type="const-char*" name="attribute"/>
-          <parameter type="guint64" name="value"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
-          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncResult*" name="result"/>
+          <parameter type="GFileInfo**" name="info"/>
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
@@ -1457,7 +1706,7 @@
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="GFileInfo*" name="info"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -1471,6 +1720,25 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
+      <method name="set_display_name_async" symbol="g_file_set_display_name_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="const-char*" name="display_name"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="set_display_name_finish" symbol="g_file_set_display_name_finish">
+        <return-type type="GFile*"/>
+        <parameters>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </method>
       <method name="trash" symbol="g_file_trash">
         <return-type type="gboolean"/>
         <parameters>
@@ -2039,21 +2307,35 @@
     </object>
     <object name="GDataInputStream" type-name="GDataInputStream" get-type="" parent="GBufferedInputStream">
       <field name="priv" type="GDataInputStreamPrivate*"/>
-      <method name="get_byte" symbol="g_data_input_stream_get_byte">
-        <return-type type="guchar"/>
+      <method name="get_byte_order" symbol="g_data_input_stream_get_byte_order">
+        <return-type type="GDataStreamByteOrder"/>
         <parameters>
           <parameter type="GDataInputStream*" name="data_stream"/>
-          <parameter type="GCancellable*" name="cancellable"/>
-          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_byte_order" symbol="g_data_input_stream_get_byte_order">
-        <return-type type="GDataStreamByteOrder"/>
+      <method name="get_newline_type" symbol="g_data_input_stream_get_newline_type">
+        <return-type type="GDataStreamNewlineType"/>
+        <parameters>
+          <parameter type="GDataInputStream*" name="data_stream"/>
+        </parameters>
+      </method>
+      <method name="get_type" symbol="g_data_input_stream_get_type">
+        <return-type type="GType"/>
+      </method>
+      <constructor name="new" symbol="g_data_input_stream_new">
+        <parameters>
+          <parameter type="GInputStream*" name="base_stream"/>
+        </parameters>
+      </constructor>
+      <method name="read_byte" symbol="g_data_input_stream_read_byte">
+        <return-type type="guchar"/>
         <parameters>
           <parameter type="GDataInputStream*" name="data_stream"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_int16" symbol="g_data_input_stream_get_int16">
+      <method name="read_int16" symbol="g_data_input_stream_read_int16">
         <return-type type="gint16"/>
         <parameters>
           <parameter type="GDataInputStream*" name="data_stream"/>
@@ -2061,7 +2343,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_int32" symbol="g_data_input_stream_get_int32">
+      <method name="read_int32" symbol="g_data_input_stream_read_int32">
         <return-type type="gint32"/>
         <parameters>
           <parameter type="GDataInputStream*" name="data_stream"/>
@@ -2069,7 +2351,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_int64" symbol="g_data_input_stream_get_int64">
+      <method name="read_int64" symbol="g_data_input_stream_read_int64">
         <return-type type="gint64"/>
         <parameters>
           <parameter type="GDataInputStream*" name="data_stream"/>
@@ -2077,7 +2359,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_line" symbol="g_data_input_stream_get_line">
+      <method name="read_line" symbol="g_data_input_stream_read_line">
         <return-type type="char*"/>
         <parameters>
           <parameter type="GDataInputStream*" name="data_stream"/>
@@ -2086,16 +2368,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_newline_type" symbol="g_data_input_stream_get_newline_type">
-        <return-type type="GDataStreamNewlineType"/>
-        <parameters>
-          <parameter type="GDataInputStream*" name="data_stream"/>
-        </parameters>
-      </method>
-      <method name="get_type" symbol="g_data_input_stream_get_type">
-        <return-type type="GType"/>
-      </method>
-      <method name="get_uint16" symbol="g_data_input_stream_get_uint16">
+      <method name="read_uint16" symbol="g_data_input_stream_read_uint16">
         <return-type type="guint16"/>
         <parameters>
           <parameter type="GDataInputStream*" name="data_stream"/>
@@ -2103,7 +2376,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_uint32" symbol="g_data_input_stream_get_uint32">
+      <method name="read_uint32" symbol="g_data_input_stream_read_uint32">
         <return-type type="guint32"/>
         <parameters>
           <parameter type="GDataInputStream*" name="data_stream"/>
@@ -2111,7 +2384,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_uint64" symbol="g_data_input_stream_get_uint64">
+      <method name="read_uint64" symbol="g_data_input_stream_read_uint64">
         <return-type type="guint64"/>
         <parameters>
           <parameter type="GDataInputStream*" name="data_stream"/>
@@ -2119,7 +2392,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_until" symbol="g_data_input_stream_get_until">
+      <method name="read_until" symbol="g_data_input_stream_read_until">
         <return-type type="char*"/>
         <parameters>
           <parameter type="GDataInputStream*" name="data_stream"/>
@@ -2129,11 +2402,6 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <constructor name="new" symbol="g_data_input_stream_new">
-        <parameters>
-          <parameter type="GInputStream*" name="base_stream"/>
-        </parameters>
-      </constructor>
       <method name="set_byte_order" symbol="g_data_input_stream_set_byte_order">
         <return-type type="void"/>
         <parameters>
@@ -2205,7 +2473,7 @@
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GDataOutputStream*" name="data_stream"/>
-          <parameter type="char*" name="str"/>
+          <parameter type="const-char*" name="str"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -2256,6 +2524,12 @@
       <implements>
         <interface name="GAppInfo"/>
       </implements>
+      <method name="get_is_hidden" symbol="g_desktop_app_info_get_is_hidden">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GDesktopAppInfo*" name="info"/>
+        </parameters>
+      </method>
       <method name="get_type" symbol="g_desktop_app_info_get_type">
         <return-type type="GType"/>
       </method>
@@ -2264,6 +2538,11 @@
           <parameter type="const-char*" name="desktop_id"/>
         </parameters>
       </constructor>
+      <constructor name="new_from_filename" symbol="g_desktop_app_info_new_from_filename">
+        <parameters>
+          <parameter type="const-char*" name="filename"/>
+        </parameters>
+      </constructor>
     </object>
     <object name="GDirectoryMonitor" type-name="GDirectoryMonitor" get-type="" parent="GObject">
       <field name="priv" type="GDirectoryMonitorPrivate*"/>
@@ -2288,6 +2567,15 @@
           <parameter type="GDirectoryMonitor*" name="monitor"/>
         </parameters>
       </method>
+      <method name="emit_event" symbol="g_directory_monitor_emit_event">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GDirectoryMonitor*" name="monitor"/>
+          <parameter type="GFile*" name="child"/>
+          <parameter type="GFile*" name="other_file"/>
+          <parameter type="GFileMonitorEvent" name="event_type"/>
+        </parameters>
+      </method>
       <method name="get_type" symbol="g_directory_monitor_get_type">
         <return-type type="GType"/>
       </method>
@@ -2595,6 +2883,12 @@
           <parameter type="GFileInfo*" name="info"/>
         </parameters>
       </method>
+      <method name="get_is_backup" symbol="g_file_info_get_is_backup">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GFileInfo*" name="info"/>
+        </parameters>
+      </method>
       <method name="get_is_hidden" symbol="g_file_info_get_is_hidden">
         <return-type type="gboolean"/>
         <parameters>
@@ -2857,7 +3151,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
-      <vfunc name="get_file_info">
+      <vfunc name="query_info">
         <return-type type="GFileInfo*"/>
         <parameters>
           <parameter type="GFileInputStream*" name="stream"/>
@@ -2866,6 +3160,25 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
+      <vfunc name="query_info_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInputStream*" name="stream"/>
+          <parameter type="char*" name="attributes"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="query_info_finish">
+        <return-type type="GFileInfo*"/>
+        <parameters>
+          <parameter type="GFileInputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
+      </vfunc>
       <implements>
         <interface name="GSeekable"/>
       </implements>
@@ -2875,7 +3188,10 @@
           <parameter type="GFileInputStream*" name="stream"/>
         </parameters>
       </method>
-      <method name="get_file_info" symbol="g_file_input_stream_get_file_info">
+      <method name="get_type" symbol="g_file_input_stream_get_type">
+        <return-type type="GType"/>
+      </method>
+      <method name="query_info" symbol="g_file_input_stream_query_info">
         <return-type type="GFileInfo*"/>
         <parameters>
           <parameter type="GFileInputStream*" name="stream"/>
@@ -2884,8 +3200,24 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_type" symbol="g_file_input_stream_get_type">
-        <return-type type="GType"/>
+      <method name="query_info_async" symbol="g_file_input_stream_query_info_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileInputStream*" name="stream"/>
+          <parameter type="char*" name="attributes"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="query_info_finish" symbol="g_file_input_stream_query_info_finish">
+        <return-type type="GFileInfo*"/>
+        <parameters>
+          <parameter type="GFileInputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
       </method>
       <method name="seek" symbol="g_file_input_stream_seek">
         <return-type type="gboolean"/>
@@ -2932,6 +3264,16 @@
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="GFileMonitorFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+        </parameters>
+      </method>
+      <method name="emit_event" symbol="g_file_monitor_emit_event">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileMonitor*" name="monitor"/>
+          <parameter type="GFile*" name="file"/>
+          <parameter type="GFile*" name="other_file"/>
+          <parameter type="GFileMonitorEvent" name="event_type"/>
         </parameters>
       </method>
       <method name="file" symbol="g_file_monitor_file">
@@ -2939,6 +3281,7 @@
         <parameters>
           <parameter type="GFile*" name="file"/>
           <parameter type="GFileMonitorFlags" name="flags"/>
+          <parameter type="GCancellable*" name="cancellable"/>
         </parameters>
       </method>
       <method name="get_type" symbol="g_file_monitor_get_type">
@@ -2997,7 +3340,7 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
-      <vfunc name="get_file_info">
+      <vfunc name="query_info">
         <return-type type="GFileInfo*"/>
         <parameters>
           <parameter type="GFileOutputStream*" name="stream"/>
@@ -3006,14 +3349,31 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
-      <vfunc name="get_etag">
-        <return-type type="char*"/>
+      <vfunc name="query_info_async">
+        <return-type type="void"/>
         <parameters>
           <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="char*" name="attributes"/>
+          <parameter type="int" name="io_priority"/>
           <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="query_info_finish">
+        <return-type type="GFileInfo*"/>
+        <parameters>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="res"/>
           <parameter type="GError**" name="error"/>
         </parameters>
       </vfunc>
+      <vfunc name="get_etag">
+        <return-type type="char*"/>
+        <parameters>
+          <parameter type="GFileOutputStream*" name="stream"/>
+        </parameters>
+      </vfunc>
       <implements>
         <interface name="GSeekable"/>
       </implements>
@@ -3033,11 +3393,12 @@
         <return-type type="char*"/>
         <parameters>
           <parameter type="GFileOutputStream*" name="stream"/>
-          <parameter type="GCancellable*" name="cancellable"/>
-          <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_file_info" symbol="g_file_output_stream_get_file_info">
+      <method name="get_type" symbol="g_file_output_stream_get_type">
+        <return-type type="GType"/>
+      </method>
+      <method name="query_info" symbol="g_file_output_stream_query_info">
         <return-type type="GFileInfo*"/>
         <parameters>
           <parameter type="GFileOutputStream*" name="stream"/>
@@ -3046,8 +3407,24 @@
           <parameter type="GError**" name="error"/>
         </parameters>
       </method>
-      <method name="get_type" symbol="g_file_output_stream_get_type">
-        <return-type type="GType"/>
+      <method name="query_info_async" symbol="g_file_output_stream_query_info_async">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="char*" name="attributes"/>
+          <parameter type="int" name="io_priority"/>
+          <parameter type="GCancellable*" name="cancellable"/>
+          <parameter type="GAsyncReadyCallback" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="query_info_finish" symbol="g_file_output_stream_query_info_finish">
+        <return-type type="GFileInfo*"/>
+        <parameters>
+          <parameter type="GFileOutputStream*" name="stream"/>
+          <parameter type="GAsyncResult*" name="res"/>
+          <parameter type="GError**" name="error"/>
+        </parameters>
       </method>
       <method name="seek" symbol="g_file_output_stream_seek">
         <return-type type="gboolean"/>
@@ -3337,7 +3714,7 @@
         <parameters>
           <parameter type="const-char*" name="filename"/>
           <parameter type="const-char*" name="attributes"/>
-          <parameter type="GFileGetInfoFlags" name="flags"/>
+          <parameter type="GFileQueryInfoFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -3371,6 +3748,7 @@
         <return-type type="GFileOutputStream*"/>
         <parameters>
           <parameter type="const-char*" name="filename"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -3379,6 +3757,7 @@
         <return-type type="GFileOutputStream*"/>
         <parameters>
           <parameter type="const-char*" name="filename"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -3392,6 +3771,7 @@
           <parameter type="const-char*" name="filename"/>
           <parameter type="const-char*" name="etag"/>
           <parameter type="gboolean" name="make_backup"/>
+          <parameter type="GFileCreateFlags" name="flags"/>
           <parameter type="GCancellable*" name="cancellable"/>
           <parameter type="GError**" name="error"/>
         </parameters>
@@ -3415,9 +3795,28 @@
           <parameter type="gssize" name="len"/>
         </parameters>
       </method>
+      <method name="get_data" symbol="g_memory_input_stream_get_data">
+        <return-type type="const-void*"/>
+        <parameters>
+          <parameter type="GMemoryInputStream*" name="stream"/>
+        </parameters>
+      </method>
+      <method name="get_data_size" symbol="g_memory_input_stream_get_data_size">
+        <return-type type="gsize"/>
+        <parameters>
+          <parameter type="GMemoryInputStream*" name="stream"/>
+        </parameters>
+      </method>
       <method name="get_type" symbol="g_memory_input_stream_get_type">
         <return-type type="GType"/>
       </method>
+      <method name="set_free_data" symbol="g_memory_input_stream_set_free_data">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GMemoryInputStream*" name="stream"/>
+          <parameter type="gboolean" name="free_data"/>
+        </parameters>
+      </method>
     </object>
     <object name="GMemoryOutputStream" type-name="GMemoryOutputStream" get-type="" parent="GOutputStream">
       <field name="priv" type="GMemoryOutputStreamPrivate*"/>
@@ -3441,6 +3840,13 @@
           <parameter type="GByteArray*" name="data"/>
         </parameters>
       </constructor>
+      <method name="set_free_on_close" symbol="g_memory_output_stream_set_free_on_close">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GMemoryOutputStream*" name="ostream"/>
+          <parameter type="gboolean" name="free_on_close"/>
+        </parameters>
+      </method>
       <method name="set_max_size" symbol="g_memory_output_stream_set_max_size">
         <return-type type="void"/>
         <parameters>
@@ -4213,6 +4619,12 @@
           <parameter type="GVfs*" name="vfs"/>
         </parameters>
       </method>
+      <method name="get_supported_uri_schemes" symbol="g_vfs_get_supported_uri_schemes">
+        <return-type type="const-gchar**"/>
+        <parameters>
+          <parameter type="GVfs*" name="vfs"/>
+        </parameters>
+      </method>
       <method name="get_type" symbol="g_vfs_get_type">
         <return-type type="GType"/>
       </method>
@@ -4566,20 +4978,107 @@
       <field name="is_sticky" type="gboolean" readable="1" writable="1"/>
       <field name="owner" type="int" readable="1" writable="1"/>
     </struct>
-    <struct name="GUnixMount" type-name="GUnixMount" get-type="">
-      <field name="mount_path" type="char*" readable="1" writable="1"/>
-      <field name="device_path" type="char*" readable="1" writable="1"/>
-      <field name="filesystem_type" type="char*" readable="1" writable="1"/>
-      <field name="is_read_only" type="gboolean" readable="1" writable="1"/>
+    <struct name="GUnixMount" type-name="GUnixMount" get-type="" opaque="true">
+      <method name="compare" symbol="g_unix_mount_compare">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="GUnixMount*" name="mount_entry1"/>
+          <parameter type="GUnixMount*" name="mount_entry2"/>
+        </parameters>
+      </method>
+      <method name="free" symbol="g_unix_mount_free">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GUnixMount*" name="mount_entry"/>
+        </parameters>
+      </method>
+      <method name="get_device_path" symbol="g_unix_mount_get_device_path">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GUnixMount*" name="mount_entry"/>
+        </parameters>
+      </method>
+      <method name="get_fs_type" symbol="g_unix_mount_get_fs_type">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GUnixMount*" name="mount_entry"/>
+        </parameters>
+      </method>
+      <method name="get_mount_path" symbol="g_unix_mount_get_mount_path">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GUnixMount*" name="mount_entry"/>
+        </parameters>
+      </method>
+      <method name="guess_type" symbol="g_unix_mount_guess_type">
+        <return-type type="GUnixMountType"/>
+        <parameters>
+          <parameter type="GUnixMount*" name="mount_entry"/>
+        </parameters>
+      </method>
+      <method name="is_readonly" symbol="g_unix_mount_is_readonly">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GUnixMount*" name="mount_entry"/>
+        </parameters>
+      </method>
     </struct>
-    <struct name="GUnixMountPoint" type-name="GUnixMountPoint" get-type="">
-      <field name="mount_path" type="char*" readable="1" writable="1"/>
-      <field name="device_path" type="char*" readable="1" writable="1"/>
-      <field name="filesystem_type" type="char*" readable="1" writable="1"/>
-      <field name="dev_opt" type="char*" readable="1" writable="1"/>
-      <field name="is_read_only" type="gboolean" readable="1" writable="1"/>
-      <field name="is_user_mountable" type="gboolean" readable="1" writable="1"/>
-      <field name="is_loopback" type="gboolean" readable="1" writable="1"/>
+    <struct name="GUnixMountPoint" type-name="GUnixMountPoint" get-type="" opaque="true">
+      <method name="compare" symbol="g_unix_mount_point_compare">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="GUnixMountPoint*" name="mount_point1"/>
+          <parameter type="GUnixMountPoint*" name="mount_point2"/>
+        </parameters>
+      </method>
+      <method name="free" symbol="g_unix_mount_point_free">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GUnixMountPoint*" name="mount_point"/>
+        </parameters>
+      </method>
+      <method name="get_device_path" symbol="g_unix_mount_point_get_device_path">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GUnixMountPoint*" name="mount_point"/>
+        </parameters>
+      </method>
+      <method name="get_fs_type" symbol="g_unix_mount_point_get_fs_type">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GUnixMountPoint*" name="mount_point"/>
+        </parameters>
+      </method>
+      <method name="get_mount_path" symbol="g_unix_mount_point_get_mount_path">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter type="GUnixMountPoint*" name="mount_point"/>
+        </parameters>
+      </method>
+      <method name="guess_type" symbol="g_unix_mount_point_guess_type">
+        <return-type type="GUnixMountType"/>
+        <parameters>
+          <parameter type="GUnixMountPoint*" name="mount_point"/>
+        </parameters>
+      </method>
+      <method name="is_loopback" symbol="g_unix_mount_point_is_loopback">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GUnixMountPoint*" name="mount_point"/>
+        </parameters>
+      </method>
+      <method name="is_readonly" symbol="g_unix_mount_point_is_readonly">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GUnixMountPoint*" name="mount_point"/>
+        </parameters>
+      </method>
+      <method name="is_user_mountable" symbol="g_unix_mount_point_is_user_mountable">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GUnixMountPoint*" name="mount_point"/>
+        </parameters>
+      </method>
     </struct>
   </namespace>
 </api>
diff --git a/vapi/packages/gio-standalone/gio-standalone.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
similarity index 100%
rename from vapi/packages/gio-standalone/gio-standalone.metadata
rename to vapi/packages/gio-2.0/gio-2.0.metadata
diff --git a/vapi/packages/gio-standalone/gio-standalone.namespace b/vapi/packages/gio-2.0/gio-2.0.namespace
similarity index 100%
rename from vapi/packages/gio-standalone/gio-standalone.namespace
rename to vapi/packages/gio-2.0/gio-2.0.namespace