diff --git a/ChangeLog b/ChangeLog
index 6a45178..d622edb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-02-19  Ryan Lortie  <desrt@desrt.ca>
+
+	* vapi/gio-2.0.vapi
+	* vapi/gio-unix-2.0.vapi
+	* vapi/packages/gio-2.0/gio-2.0.gi
+	* vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
+
+	Generate gio GIDL on a machine with my gresolver glib branch
+	installed.  Regenerate vapi.
+
 2009-02-19  Ali Sabil  <ali.sabil@gmail.com>
 
 	* vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala:
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 225cdfd..9c591c9 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -46,6 +46,7 @@ namespace GLib {
 		public static unowned GLib.Cancellable get_current ();
 		public int get_fd ();
 		public bool is_cancelled ();
+		public void make_pollfd (GLib.PollFD pollfd);
 		[CCode (has_construct_function = false)]
 		public Cancellable ();
 		public void pop_current ();
@@ -65,10 +66,14 @@ namespace GLib {
 		public int32 read_int32 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public int64 read_int64 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public unowned string read_line (out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
+		public void read_line_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+		public unowned string read_line_finish (GLib.AsyncResult _result, size_t length) throws GLib.Error;
 		public uint16 read_uint16 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public uint32 read_uint32 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public uint64 read_uint64 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public unowned string read_until (string stop_chars, out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
+		public void read_until_async (string stop_chars, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+		public unowned string read_until_finish (GLib.AsyncResult _result, size_t length) throws GLib.Error;
 		public void set_byte_order (GLib.DataStreamByteOrder order);
 		public void set_newline_type (GLib.DataStreamNewlineType type);
 		public GLib.DataStreamByteOrder byte_order { get; set; }
@@ -90,6 +95,33 @@ namespace GLib {
 		public void set_byte_order (GLib.DataStreamByteOrder order);
 		public GLib.DataStreamByteOrder byte_order { get; set; }
 	}
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class Emblem : GLib.Object, GLib.Icon {
+		public unowned GLib.Icon get_icon ();
+		public GLib.EmblemOrigin get_origin ();
+		[CCode (has_construct_function = false)]
+		public Emblem (GLib.Icon icon);
+		[CCode (has_construct_function = false)]
+		public Emblem.with_origin (GLib.Icon icon, GLib.EmblemOrigin origin);
+		public GLib.Object icon { get; construct; }
+		public GLib.EmblemOrigin origin { get; construct; }
+	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class EmblemClass {
+	}
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class EmblemedIcon : GLib.Object, GLib.Icon {
+		public void add_emblem (GLib.Emblem emblem);
+		public unowned GLib.List get_emblems ();
+		public unowned GLib.Icon get_icon ();
+		[CCode (type = "GIcon*", has_construct_function = false)]
+		public EmblemedIcon (GLib.Icon icon, GLib.Emblem emblem);
+	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class EmblemedIconClass {
+	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FileAttributeInfo {
@@ -98,7 +130,7 @@ namespace GLib {
 		public GLib.FileAttributeType type;
 	}
 	[Compact]
-	[CCode (ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref", cheader_filename = "gio/gio.h")]
+	[CCode (ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref", type_id = "G_TYPE_FILE_ATTRIBUTE_INFO_LIST", cheader_filename = "gio/gio.h")]
 	public class FileAttributeInfoList {
 		public weak GLib.FileAttributeInfo infos;
 		public int n_infos;
@@ -125,18 +157,21 @@ namespace GLib {
 		public virtual bool close_finish (GLib.AsyncResult _result) throws GLib.Error;
 		[NoWrapper]
 		public virtual bool close_fn (GLib.Cancellable? cancellable) throws GLib.Error;
+		public unowned GLib.File get_container ();
 		public bool has_pending ();
 		public bool is_closed ();
 		public virtual GLib.FileInfo next_file (GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual void next_files_async (int num_files, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public virtual GLib.List<GLib.FileInfo> next_files_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public void set_pending (bool pending);
+		public GLib.File container { construct; }
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
-	public class FileIcon : GLib.Object, GLib.Icon, GLib.LoadableIcon {
+	public class FileIcon : GLib.Object, GLib.LoadableIcon, GLib.Icon {
 		public unowned GLib.File get_file ();
 		[CCode (type = "GIcon*", has_construct_function = false)]
 		public FileIcon (GLib.File file);
+		public GLib.File file { get; construct; }
 	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -261,12 +296,18 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FilterInputStream : GLib.InputStream {
 		public unowned GLib.InputStream get_base_stream ();
+		public bool get_close_base_stream ();
+		public void set_close_base_stream (bool close_base);
 		public GLib.InputStream base_stream { get; construct; }
+		public bool close_base_stream { get; construct; }
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FilterOutputStream : GLib.OutputStream {
 		public unowned GLib.OutputStream get_base_stream ();
+		public bool get_close_base_stream ();
+		public void set_close_base_stream (bool close_base);
 		public GLib.OutputStream base_stream { get; construct; }
+		public bool close_base_stream { get; construct; }
 	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -305,6 +346,52 @@ namespace GLib {
 		public void send_to_mainloop_async (GLib.SourceFunc func, GLib.DestroyNotify? notify);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
+	public class InetAddress : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public InetAddress.any (GLib.SocketFamily family);
+		[CCode (has_construct_function = false)]
+		public InetAddress.from_bytes (uchar bytes, GLib.SocketFamily family);
+		[CCode (has_construct_function = false)]
+		public InetAddress.from_string (string str);
+		public GLib.SocketFamily get_family ();
+		public bool get_is_any ();
+		public bool get_is_link_local ();
+		public bool get_is_loopback ();
+		public bool get_is_mc_global ();
+		public bool get_is_mc_link_local ();
+		public bool get_is_mc_node_local ();
+		public bool get_is_mc_org_local ();
+		public bool get_is_mc_site_local ();
+		public bool get_is_multicast ();
+		public bool get_is_site_local ();
+		[CCode (has_construct_function = false)]
+		public InetAddress.loopback (GLib.SocketFamily family);
+		public virtual uchar to_bytes ();
+		public virtual unowned string to_string ();
+		[NoAccessorMethod]
+		public void* bytes { get; construct; }
+		public GLib.SocketFamily family { get; construct; }
+		public bool is_any { get; }
+		public bool is_link_local { get; }
+		public bool is_loopback { get; }
+		public bool is_mc_global { get; }
+		public bool is_mc_link_local { get; }
+		public bool is_mc_node_local { get; }
+		public bool is_mc_org_local { get; }
+		public bool is_mc_site_local { get; }
+		public bool is_multicast { get; }
+		public bool is_site_local { get; }
+	}
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class InetSocketAddress : GLib.SocketAddress, GLib.SocketConnectable {
+		public unowned GLib.InetAddress get_address ();
+		public uint16 get_port ();
+		[CCode (type = "GSocketAddress*", has_construct_function = false)]
+		public InetSocketAddress (GLib.InetAddress address, uint16 port);
+		public GLib.InetAddress address { get; construct; }
+		public uint port { get; construct; }
+	}
+	[CCode (cheader_filename = "gio/gio.h")]
 	public class InputStream : GLib.Object {
 		public void clear_pending ();
 		public bool close (GLib.Cancellable? cancellable) throws GLib.Error;
@@ -363,6 +450,7 @@ namespace GLib {
 		public string password { get; set; }
 		public GLib.PasswordSave password_save { get; set; }
 		public string username { get; set; }
+		public virtual signal void aborted ();
 		public virtual signal void ask_password (string message, string default_user, string default_domain, GLib.AskPasswordFlags flags);
 		public virtual signal void ask_question (string message, string[] choices);
 		[HasEmitter]
@@ -374,6 +462,26 @@ namespace GLib {
 		public virtual unowned GLib.Mount get_mount_for_mount_path (string mount_path, GLib.Cancellable? cancellable);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
+	public class NetworkAddress : GLib.Object, GLib.SocketConnectable {
+		public unowned string get_hostname ();
+		public uint16 get_port ();
+		[CCode (type = "GSocketConnectable*", has_construct_function = false)]
+		public NetworkAddress (string hostname, uint16 port);
+		public string hostname { get; construct; }
+		public uint port { get; construct; }
+	}
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class NetworkService : GLib.Object, GLib.SocketConnectable {
+		public unowned string get_domain ();
+		public unowned string get_protocol ();
+		public unowned string get_service ();
+		[CCode (type = "GSocketConnectable*", has_construct_function = false)]
+		public NetworkService (string service, string protocol, string domain);
+		public string domain { get; construct; }
+		public string protocol { get; construct; }
+		public string service { get; construct; }
+	}
+	[CCode (cheader_filename = "gio/gio.h")]
 	public class OutputStream : GLib.Object {
 		public void clear_pending ();
 		public bool close (GLib.Cancellable? cancellable) throws GLib.Error;
@@ -398,6 +506,23 @@ namespace GLib {
 		public virtual ssize_t write_fn (void* buffer, size_t count, GLib.Cancellable? cancellable) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
+	public class Resolver : GLib.Object {
+		public static GLib.Quark error_quark ();
+		public static void free_addresses (GLib.List addresses);
+		public static void free_targets (GLib.List targets);
+		public static unowned GLib.Resolver get_default ();
+		public virtual unowned string lookup_by_address (GLib.InetAddress address, GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual void lookup_by_address_async (GLib.InetAddress address, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+		public virtual unowned string lookup_by_address_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public virtual unowned GLib.List lookup_by_name (string hostname, GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual void lookup_by_name_async (string hostname, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+		public virtual unowned GLib.List lookup_by_name_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public virtual unowned GLib.List lookup_service (string service, string protocol, string domain, GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual void lookup_service_async (string service, string protocol, string domain, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+		public virtual unowned GLib.List lookup_service_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public void set_default ();
+	}
+	[CCode (cheader_filename = "gio/gio.h")]
 	public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
 		public void complete ();
 		public void complete_in_idle ();
@@ -409,6 +534,7 @@ namespace GLib {
 		public void* get_op_res_gpointer ();
 		public ssize_t get_op_res_gssize ();
 		public void* get_source_tag ();
+		public static bool is_valid (GLib.AsyncResult _result, GLib.Object source, void* source_tag);
 		[CCode (has_construct_function = false)]
 		public SimpleAsyncResult (GLib.Object source_object, GLib.AsyncReadyCallback callback, void* source_tag);
 		public bool propagate_error () throws GLib.Error;
@@ -426,6 +552,28 @@ namespace GLib {
 	public class SimpleAsyncResultClass {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
+	public class SocketAddress : GLib.Object, GLib.SocketConnectable {
+		[CCode (has_construct_function = false)]
+		public SocketAddress.from_native (void* native, size_t len);
+		public virtual GLib.SocketFamily get_family ();
+		public virtual ssize_t get_native_size ();
+		public virtual bool to_native (void* dest, size_t destlen);
+		public GLib.SocketFamily family { get; }
+	}
+	[Compact]
+	[CCode (copy_function = "g_srv_target_copy", type_id = "G_TYPE_SRV_TARGET", cheader_filename = "gio/gio.h")]
+	public class SrvTarget {
+		public unowned GLib.SrvTarget copy ();
+		public ulong get_expires ();
+		public unowned string get_hostname ();
+		public uint16 get_port ();
+		public uint16 get_priority ();
+		public uint16 get_weight ();
+		public static unowned GLib.List list_sort (GLib.List targets);
+		[CCode (has_construct_function = false)]
+		public SrvTarget (string hostname, uint16 port, uint16 priority, uint16 weight, ulong expires);
+	}
+	[CCode (cheader_filename = "gio/gio.h")]
 	public class ThemedIcon : GLib.Object, GLib.Icon {
 		public void append_name (string iconname);
 		[CCode (type = "GIcon*", has_construct_function = false)]
@@ -439,7 +587,8 @@ namespace GLib {
 		public ThemedIcon.with_default_fallbacks (string iconname);
 		public string name { construct; }
 		public string[] names { get; construct; }
-		public bool use_default_fallbacks { construct; }
+		[NoAccessorMethod]
+		public bool use_default_fallbacks { get; construct; }
 	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -469,6 +618,7 @@ namespace GLib {
 		public virtual signal void drive_changed (GLib.Drive drive);
 		public virtual signal void drive_connected (GLib.Drive drive);
 		public virtual signal void drive_disconnected (GLib.Drive drive);
+		public virtual signal void drive_eject_button (GLib.Drive drive);
 		public virtual signal void mount_added (GLib.Mount mount);
 		public virtual signal void mount_changed (GLib.Mount mount);
 		public virtual signal void mount_pre_unmount (GLib.Mount mount);
@@ -480,12 +630,17 @@ namespace GLib {
 	[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_delete ();
 		public abstract bool can_remove_supports_type ();
 		public static unowned GLib.AppInfo create_from_commandline (string commandline, string application_name, GLib.AppInfoCreateFlags flags) throws GLib.Error;
+		public bool @delete ();
+		[NoWrapper]
+		public abstract bool do_delete ();
 		public abstract unowned GLib.AppInfo dup ();
 		public abstract bool equal (GLib.AppInfo appinfo2);
 		public static unowned GLib.List get_all ();
 		public static unowned GLib.List get_all_for_type (string content_type);
+		public abstract unowned string get_commandline ();
 		public static unowned GLib.AppInfo get_default_for_type (string content_type, bool must_support_uris);
 		public static unowned GLib.AppInfo get_default_for_uri_scheme (string uri_scheme);
 		public abstract unowned string get_description ();
@@ -497,6 +652,7 @@ namespace GLib {
 		public static bool launch_default_for_uri (string uri, GLib.AppLaunchContext? launch_context) throws GLib.Error;
 		public abstract bool launch_uris (GLib.List? uris, GLib.AppLaunchContext launch_context) throws GLib.Error;
 		public abstract bool remove_supports_type (string content_type) throws GLib.Error;
+		public static void reset_type_associations (string content_type);
 		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 ();
@@ -575,6 +731,7 @@ namespace GLib {
 		public abstract bool make_directory (GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool make_directory_with_parents (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable? cancellable) throws GLib.Error;
+		public unowned GLib.FileMonitor monitor (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoWrapper]
 		public abstract unowned GLib.FileMonitor monitor_dir (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoWrapper]
@@ -633,7 +790,13 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface Icon : GLib.Object {
 		public abstract bool equal (GLib.Icon icon2);
+		[NoWrapper]
+		public abstract unowned GLib.Icon from_tokens (string tokens, int num_tokens, int version) throws GLib.Error;
 		public abstract uint hash (void* icon);
+		public static unowned GLib.Icon new_for_string (string str) throws GLib.Error;
+		public unowned string to_string ();
+		[NoWrapper]
+		public abstract bool to_tokens (GLib.PtrArray tokens, int out_version);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface LoadableIcon : GLib.Icon, GLib.Object {
@@ -653,10 +816,16 @@ namespace GLib {
 		public abstract unowned GLib.File get_root ();
 		public abstract unowned string get_uuid ();
 		public abstract unowned GLib.Volume get_volume ();
+		public abstract void guess_content_type (bool force_rescan, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+		public abstract unowned string guess_content_type_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public abstract unowned string guess_content_type_sync (bool force_rescan, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool is_shadowed ();
 		public abstract void remount (GLib.MountMountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool remount_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public void shadow ();
 		public abstract void unmount (GLib.MountUnmountFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool unmount_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public void unshadow ();
 		public virtual signal void changed ();
 		public virtual signal void unmounted ();
 	}
@@ -670,12 +839,20 @@ namespace GLib {
 		public abstract bool truncate (int64 offset, GLib.Cancellable? cancellable) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
+	public interface SocketConnectable : GLib.Object {
+		public abstract unowned GLib.SocketAddress get_next (GLib.Cancellable? cancellable) throws GLib.Error;
+		public abstract void get_next_async (GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+		public abstract unowned GLib.SocketAddress get_next_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public abstract void reset ();
+	}
+	[CCode (cheader_filename = "gio/gio.h")]
 	public interface Volume : GLib.Object {
 		public abstract bool can_eject ();
 		public abstract bool can_mount ();
 		public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool eject_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public abstract unowned string enumerate_identifiers ();
+		public abstract unowned GLib.File get_activation_root ();
 		public abstract unowned GLib.Drive get_drive ();
 		public abstract unowned GLib.Icon get_icon ();
 		public abstract unowned string get_identifier (string kind);
@@ -719,6 +896,13 @@ namespace GLib {
 		CR_LF,
 		ANY
 	}
+	[CCode (cprefix = "G_EMBLEM_ORIGIN_", cheader_filename = "gio/gio.h")]
+	public enum EmblemOrigin {
+		UNKNOWN,
+		DEVICE,
+		LIVEMETADATA,
+		TAG
+	}
 	[CCode (cprefix = "G_FILE_ATTRIBUTE_INFO_", cheader_filename = "gio/gio.h")]
 	[Flags]
 	public enum FileAttributeInfoFlags {
@@ -752,13 +936,15 @@ namespace GLib {
 		BACKUP,
 		NOFOLLOW_SYMLINKS,
 		ALL_METADATA,
-		NO_FALLBACK_FOR_MOVE
+		NO_FALLBACK_FOR_MOVE,
+		TARGET_DEFAULT_PERMS
 	}
 	[CCode (cprefix = "G_FILE_CREATE_", cheader_filename = "gio/gio.h")]
 	[Flags]
 	public enum FileCreateFlags {
 		NONE,
-		PRIVATE
+		PRIVATE,
+		REPLACE_DESTINATION
 	}
 	[CCode (cprefix = "G_FILE_MONITOR_EVENT_", cheader_filename = "gio/gio.h")]
 	public enum FileMonitorEvent {
@@ -827,6 +1013,19 @@ namespace GLib {
 		FOR_SESSION,
 		PERMANENTLY
 	}
+	[CCode (cprefix = "G_RESOLVER_ERROR_", cheader_filename = "gio/gio.h")]
+	public enum ResolverError {
+		NOT_FOUND,
+		TEMPORARY_FAILURE,
+		INTERNAL
+	}
+	[CCode (cprefix = "G_SOCKET_FAMILY_", cheader_filename = "gio/gio.h")]
+	public enum SocketFamily {
+		INVALID,
+		IPV4,
+		IPV6,
+		UNIX
+	}
 	[CCode (cprefix = "G_IO_ERROR_", cheader_filename = "gio/gio.h")]
 	public errordomain IOError {
 		FAILED,
@@ -860,6 +1059,7 @@ namespace GLib {
 		HOST_NOT_FOUND,
 		WOULD_MERGE,
 		FAILED_HANDLED,
+		TOO_MANY_OPEN_FILES,
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res);
@@ -924,8 +1124,12 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_OWNER_USER_REAL;
 	[CCode (cheader_filename = "gio/gio.h")]
+	public const string FILE_ATTRIBUTE_PREVIEW_ICON;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_SELINUX_CONTEXT;
 	[CCode (cheader_filename = "gio/gio.h")]
+	public const string FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE;
 	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_COPY_NAME;
@@ -1031,6 +1235,8 @@ namespace GLib {
 	public static unowned string g_content_type_get_mime_type (string type);
 	[CCode (cname = "g_content_type_guess", cheader_filename = "gio/gio.h")]
 	public static unowned string g_content_type_guess (string filename, uchar[] data, out bool result_uncertain);
+	[CCode (cname = "g_content_type_guess_for_tree", cheader_filename = "gio/gio.h")]
+	public static unowned string g_content_type_guess_for_tree (GLib.File root);
 	[CCode (cname = "g_content_type_is_a", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_is_a (string type, string supertype);
 	[CCode (cname = "g_content_type_is_unknown", cheader_filename = "gio/gio.h")]
diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi
index 060a341..77ecd95 100644
--- a/vapi/gio-unix-2.0.vapi
+++ b/vapi/gio-unix-2.0.vapi
@@ -1,4 +1,4 @@
-/* gio-unix-2.0.vapi generated by lt-vapigen, do not modify. */
+/* gio-unix-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "G", lower_case_cprefix = "g_")]
 namespace GLib {
@@ -6,6 +6,8 @@ namespace GLib {
 	public class DesktopAppInfo : GLib.Object, GLib.AppInfo {
 		[CCode (has_construct_function = false)]
 		public DesktopAppInfo.from_filename (string filename);
+		[CCode (has_construct_function = false)]
+		public DesktopAppInfo.from_keyfile (GLib.KeyFile key_file);
 		public bool get_is_hidden ();
 		[CCode (has_construct_function = false)]
 		public DesktopAppInfo (string desktop_id);
@@ -13,8 +15,13 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gunixinputstream.h")]
 	public class UnixInputStream : GLib.InputStream {
+		public bool get_close_fd ();
+		public int get_fd ();
 		[CCode (type = "GInputStream*", has_construct_function = false)]
-		public UnixInputStream (int fd, bool close_fd_at_close);
+		public UnixInputStream (int fd, bool close_fd);
+		public void set_close_fd (bool close_fd);
+		public bool close_fd { get; set; }
+		public int fd { get; construct; }
 	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
@@ -48,8 +55,20 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gunixoutputstream.h")]
 	public class UnixOutputStream : GLib.OutputStream {
+		public bool get_close_fd ();
+		public int get_fd ();
 		[CCode (type = "GOutputStream*", has_construct_function = false)]
-		public UnixOutputStream (int fd, bool close_fd_at_close);
+		public UnixOutputStream (int fd, bool close_fd);
+		public void set_close_fd (bool close_fd);
+		public bool close_fd { get; set; }
+		public int fd { get; construct; }
+	}
+	[CCode (cheader_filename = "gio/gunixmounts.h")]
+	public class UnixSocketAddress : GLib.SocketAddress, GLib.SocketConnectable {
+		[CCode (type = "GSocketAddress*", has_construct_function = false)]
+		public UnixSocketAddress (string path);
+		[NoAccessorMethod]
+		public string path { owned get; construct; }
 	}
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
 	public interface DesktopAppInfoLookup : GLib.Object {
diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi
index 67f25ef..b2bb70e 100644
--- a/vapi/packages/gio-2.0/gio-2.0.gi
+++ b/vapi/packages/gio-2.0/gio-2.0.gi
@@ -47,6 +47,12 @@
 				<parameter name="result_uncertain" type="gboolean*"/>
 			</parameters>
 		</function>
+		<function name="g_content_type_guess_for_tree" symbol="g_content_type_guess_for_tree">
+			<return-type type="char**"/>
+			<parameters>
+				<parameter name="root" type="GFile*"/>
+			</parameters>
+		</function>
 		<function name="g_content_type_is_a" symbol="g_content_type_is_a">
 			<return-type type="gboolean"/>
 			<parameters>
@@ -75,7 +81,7 @@
 		<function name="g_io_modules_load_all_in_directory" symbol="g_io_modules_load_all_in_directory">
 			<return-type type="GList*"/>
 			<parameters>
-				<parameter name="dirname" type="char*"/>
+				<parameter name="dirname" type="gchar*"/>
 			</parameters>
 		</function>
 		<function name="g_io_scheduler_cancel_all_jobs" symbol="g_io_scheduler_cancel_all_jobs">
@@ -158,52 +164,15 @@
 				<parameter name="cancellable" type="GCancellable*"/>
 			</parameters>
 		</callback>
+		<struct name="GEmblemClass">
+		</struct>
+		<struct name="GEmblemedIconClass">
+		</struct>
 		<struct name="GFileAttributeInfo">
 			<field name="name" type="char*"/>
 			<field name="type" type="GFileAttributeType"/>
 			<field name="flags" type="GFileAttributeInfoFlags"/>
 		</struct>
-		<struct name="GFileAttributeInfoList">
-			<method name="add" symbol="g_file_attribute_info_list_add">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="list" type="GFileAttributeInfoList*"/>
-					<parameter name="name" type="char*"/>
-					<parameter name="type" type="GFileAttributeType"/>
-					<parameter name="flags" type="GFileAttributeInfoFlags"/>
-				</parameters>
-			</method>
-			<method name="dup" symbol="g_file_attribute_info_list_dup">
-				<return-type type="GFileAttributeInfoList*"/>
-				<parameters>
-					<parameter name="list" type="GFileAttributeInfoList*"/>
-				</parameters>
-			</method>
-			<method name="lookup" symbol="g_file_attribute_info_list_lookup">
-				<return-type type="GFileAttributeInfo*"/>
-				<parameters>
-					<parameter name="list" type="GFileAttributeInfoList*"/>
-					<parameter name="name" type="char*"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="g_file_attribute_info_list_new">
-				<return-type type="GFileAttributeInfoList*"/>
-			</method>
-			<method name="ref" symbol="g_file_attribute_info_list_ref">
-				<return-type type="GFileAttributeInfoList*"/>
-				<parameters>
-					<parameter name="list" type="GFileAttributeInfoList*"/>
-				</parameters>
-			</method>
-			<method name="unref" symbol="g_file_attribute_info_list_unref">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="list" type="GFileAttributeInfoList*"/>
-				</parameters>
-			</method>
-			<field name="infos" type="GFileAttributeInfo*"/>
-			<field name="n_infos" type="int"/>
-		</struct>
 		<struct name="GFileAttributeMatcher">
 			<method name="enumerate_namespace" symbol="g_file_attribute_matcher_enumerate_namespace">
 				<return-type type="gboolean"/>
@@ -350,6 +319,107 @@
 		</struct>
 		<struct name="GThemedIconClass">
 		</struct>
+		<boxed name="GFileAttributeInfoList" type-name="GFileAttributeInfoList" get-type="g_file_attribute_info_list_get_type">
+			<method name="add" symbol="g_file_attribute_info_list_add">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="list" type="GFileAttributeInfoList*"/>
+					<parameter name="name" type="char*"/>
+					<parameter name="type" type="GFileAttributeType"/>
+					<parameter name="flags" type="GFileAttributeInfoFlags"/>
+				</parameters>
+			</method>
+			<method name="dup" symbol="g_file_attribute_info_list_dup">
+				<return-type type="GFileAttributeInfoList*"/>
+				<parameters>
+					<parameter name="list" type="GFileAttributeInfoList*"/>
+				</parameters>
+			</method>
+			<method name="lookup" symbol="g_file_attribute_info_list_lookup">
+				<return-type type="GFileAttributeInfo*"/>
+				<parameters>
+					<parameter name="list" type="GFileAttributeInfoList*"/>
+					<parameter name="name" type="char*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="g_file_attribute_info_list_new">
+				<return-type type="GFileAttributeInfoList*"/>
+			</constructor>
+			<method name="ref" symbol="g_file_attribute_info_list_ref">
+				<return-type type="GFileAttributeInfoList*"/>
+				<parameters>
+					<parameter name="list" type="GFileAttributeInfoList*"/>
+				</parameters>
+			</method>
+			<method name="unref" symbol="g_file_attribute_info_list_unref">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="list" type="GFileAttributeInfoList*"/>
+				</parameters>
+			</method>
+			<field name="infos" type="GFileAttributeInfo*"/>
+			<field name="n_infos" type="int"/>
+		</boxed>
+		<boxed name="GSrvTarget" type-name="GSrvTarget" get-type="g_srv_target_get_type">
+			<method name="copy" symbol="g_srv_target_copy">
+				<return-type type="GSrvTarget*"/>
+				<parameters>
+					<parameter name="target" type="GSrvTarget*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="g_srv_target_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="target" type="GSrvTarget*"/>
+				</parameters>
+			</method>
+			<method name="get_expires" symbol="g_srv_target_get_expires">
+				<return-type type="time_t"/>
+				<parameters>
+					<parameter name="target" type="GSrvTarget*"/>
+				</parameters>
+			</method>
+			<method name="get_hostname" symbol="g_srv_target_get_hostname">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="target" type="GSrvTarget*"/>
+				</parameters>
+			</method>
+			<method name="get_port" symbol="g_srv_target_get_port">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="target" type="GSrvTarget*"/>
+				</parameters>
+			</method>
+			<method name="get_priority" symbol="g_srv_target_get_priority">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="target" type="GSrvTarget*"/>
+				</parameters>
+			</method>
+			<method name="get_weight" symbol="g_srv_target_get_weight">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="target" type="GSrvTarget*"/>
+				</parameters>
+			</method>
+			<method name="list_sort" symbol="g_srv_target_list_sort">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="targets" type="GList*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="g_srv_target_new">
+				<return-type type="GSrvTarget*"/>
+				<parameters>
+					<parameter name="hostname" type="gchar*"/>
+					<parameter name="port" type="guint16"/>
+					<parameter name="priority" type="guint16"/>
+					<parameter name="weight" type="guint16"/>
+					<parameter name="expires" type="time_t"/>
+				</parameters>
+			</constructor>
+		</boxed>
 		<enum name="GDataStreamByteOrder" type-name="GDataStreamByteOrder" get-type="g_data_stream_byte_order_get_type">
 			<member name="G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN" value="0"/>
 			<member name="G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN" value="1"/>
@@ -361,6 +431,12 @@
 			<member name="G_DATA_STREAM_NEWLINE_TYPE_CR_LF" value="2"/>
 			<member name="G_DATA_STREAM_NEWLINE_TYPE_ANY" value="3"/>
 		</enum>
+		<enum name="GEmblemOrigin" type-name="GEmblemOrigin" get-type="g_emblem_origin_get_type">
+			<member name="G_EMBLEM_ORIGIN_UNKNOWN" value="0"/>
+			<member name="G_EMBLEM_ORIGIN_DEVICE" value="1"/>
+			<member name="G_EMBLEM_ORIGIN_LIVEMETADATA" value="2"/>
+			<member name="G_EMBLEM_ORIGIN_TAG" value="3"/>
+		</enum>
 		<enum name="GFileAttributeStatus" type-name="GFileAttributeStatus" get-type="g_file_attribute_status_get_type">
 			<member name="G_FILE_ATTRIBUTE_STATUS_UNSET" value="0"/>
 			<member name="G_FILE_ATTRIBUTE_STATUS_SET" value="1"/>
@@ -432,6 +508,7 @@
 			<member name="G_IO_ERROR_HOST_NOT_FOUND" value="28"/>
 			<member name="G_IO_ERROR_WOULD_MERGE" value="29"/>
 			<member name="G_IO_ERROR_FAILED_HANDLED" value="30"/>
+			<member name="G_IO_ERROR_TOO_MANY_OPEN_FILES" value="31"/>
 		</enum>
 		<enum name="GMountMountFlags" type-name="GMountMountFlags" get-type="g_mount_mount_flags_get_type">
 			<member name="G_MOUNT_MOUNT_NONE" value="0"/>
@@ -446,6 +523,17 @@
 			<member name="G_PASSWORD_SAVE_FOR_SESSION" value="1"/>
 			<member name="G_PASSWORD_SAVE_PERMANENTLY" value="2"/>
 		</enum>
+		<enum name="GResolverError" type-name="GResolverError" get-type="g_resolver_error_get_type">
+			<member name="G_RESOLVER_ERROR_NOT_FOUND" value="0"/>
+			<member name="G_RESOLVER_ERROR_TEMPORARY_FAILURE" value="1"/>
+			<member name="G_RESOLVER_ERROR_INTERNAL" value="2"/>
+		</enum>
+		<enum name="GSocketFamily" type-name="GSocketFamily" get-type="g_socket_family_get_type">
+			<member name="G_SOCKET_FAMILY_INVALID" value="0"/>
+			<member name="G_SOCKET_FAMILY_IPV4" value="2"/>
+			<member name="G_SOCKET_FAMILY_IPV6" value="10"/>
+			<member name="G_SOCKET_FAMILY_UNIX" value="1"/>
+		</enum>
 		<flags name="GAppInfoCreateFlags" type-name="GAppInfoCreateFlags" get-type="g_app_info_create_flags_get_type">
 			<member name="G_APP_INFO_CREATE_NONE" value="0"/>
 			<member name="G_APP_INFO_CREATE_NEEDS_TERMINAL" value="1"/>
@@ -470,10 +558,12 @@
 			<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"/>
+			<member name="G_FILE_COPY_TARGET_DEFAULT_PERMS" value="32"/>
 		</flags>
 		<flags name="GFileCreateFlags" type-name="GFileCreateFlags" get-type="g_file_create_flags_get_type">
 			<member name="G_FILE_CREATE_NONE" value="0"/>
 			<member name="G_FILE_CREATE_PRIVATE" value="1"/>
+			<member name="G_FILE_CREATE_REPLACE_DESTINATION" value="2"/>
 		</flags>
 		<flags name="GFileMonitorFlags" type-name="GFileMonitorFlags" get-type="g_file_monitor_flags_get_type">
 			<member name="G_FILE_MONITOR_NONE" value="0"/>
@@ -723,6 +813,13 @@
 					<parameter name="cancellable" type="GCancellable*"/>
 				</parameters>
 			</method>
+			<method name="make_pollfd" symbol="g_cancellable_make_pollfd">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="pollfd" type="GPollFD*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="g_cancellable_new">
 				<return-type type="GCancellable*"/>
 			</constructor>
@@ -818,6 +915,25 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="read_line_async" symbol="g_data_input_stream_read_line_async">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="stream" type="GDataInputStream*"/>
+					<parameter name="io_priority" type="gint"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="read_line_finish" symbol="g_data_input_stream_read_line_finish">
+				<return-type type="char*"/>
+				<parameters>
+					<parameter name="stream" type="GDataInputStream*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="length" type="gsize*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<method name="read_uint16" symbol="g_data_input_stream_read_uint16">
 				<return-type type="guint16"/>
 				<parameters>
@@ -852,6 +968,26 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="read_until_async" symbol="g_data_input_stream_read_until_async">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="stream" type="GDataInputStream*"/>
+					<parameter name="stop_chars" type="gchar*"/>
+					<parameter name="io_priority" type="gint"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="read_until_finish" symbol="g_data_input_stream_read_until_finish">
+				<return-type type="char*"/>
+				<parameters>
+					<parameter name="stream" type="GDataInputStream*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="length" type="gsize*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<method name="set_byte_order" symbol="g_data_input_stream_set_byte_order">
 				<return-type type="void"/>
 				<parameters>
@@ -963,6 +1099,69 @@
 			</method>
 			<property name="byte-order" type="GDataStreamByteOrder" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
+		<object name="GEmblem" parent="GObject" type-name="GEmblem" get-type="g_emblem_get_type">
+			<implements>
+				<interface name="GIcon"/>
+			</implements>
+			<method name="get_icon" symbol="g_emblem_get_icon">
+				<return-type type="GIcon*"/>
+				<parameters>
+					<parameter name="emblem" type="GEmblem*"/>
+				</parameters>
+			</method>
+			<method name="get_origin" symbol="g_emblem_get_origin">
+				<return-type type="GEmblemOrigin"/>
+				<parameters>
+					<parameter name="emblem" type="GEmblem*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="g_emblem_new">
+				<return-type type="GEmblem*"/>
+				<parameters>
+					<parameter name="icon" type="GIcon*"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_with_origin" symbol="g_emblem_new_with_origin">
+				<return-type type="GEmblem*"/>
+				<parameters>
+					<parameter name="icon" type="GIcon*"/>
+					<parameter name="origin" type="GEmblemOrigin"/>
+				</parameters>
+			</constructor>
+			<property name="icon" type="GObject*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="origin" type="GEmblemOrigin" readable="1" writable="1" construct="0" construct-only="1"/>
+		</object>
+		<object name="GEmblemedIcon" parent="GObject" type-name="GEmblemedIcon" get-type="g_emblemed_icon_get_type">
+			<implements>
+				<interface name="GIcon"/>
+			</implements>
+			<method name="add_emblem" symbol="g_emblemed_icon_add_emblem">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="emblemed" type="GEmblemedIcon*"/>
+					<parameter name="emblem" type="GEmblem*"/>
+				</parameters>
+			</method>
+			<method name="get_emblems" symbol="g_emblemed_icon_get_emblems">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="emblemed" type="GEmblemedIcon*"/>
+				</parameters>
+			</method>
+			<method name="get_icon" symbol="g_emblemed_icon_get_icon">
+				<return-type type="GIcon*"/>
+				<parameters>
+					<parameter name="emblemed" type="GEmblemedIcon*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="g_emblemed_icon_new">
+				<return-type type="GIcon*"/>
+				<parameters>
+					<parameter name="icon" type="GIcon*"/>
+					<parameter name="emblem" type="GEmblem*"/>
+				</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"/>
@@ -990,6 +1189,12 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="get_container" symbol="g_file_enumerator_get_container">
+				<return-type type="GFile*"/>
+				<parameters>
+					<parameter name="enumerator" type="GFileEnumerator*"/>
+				</parameters>
+			</method>
 			<method name="has_pending" symbol="g_file_enumerator_has_pending">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -1036,6 +1241,7 @@
 					<parameter name="pending" type="gboolean"/>
 				</parameters>
 			</method>
+			<property name="container" type="GFile*" readable="0" writable="1" construct="0" construct-only="1"/>
 			<vfunc name="close_async">
 				<return-type type="void"/>
 				<parameters>
@@ -1092,8 +1298,8 @@
 		</object>
 		<object name="GFileIcon" parent="GObject" type-name="GFileIcon" get-type="g_file_icon_get_type">
 			<implements>
-				<interface name="GIcon"/>
 				<interface name="GLoadableIcon"/>
+				<interface name="GIcon"/>
 			</implements>
 			<method name="get_file" symbol="g_file_icon_get_file">
 				<return-type type="GFile*"/>
@@ -1107,6 +1313,7 @@
 					<parameter name="file" type="GFile*"/>
 				</parameters>
 			</constructor>
+			<property name="file" type="GFile*" readable="1" writable="1" construct="0" construct-only="1"/>
 		</object>
 		<object name="GFileInfo" parent="GObject" type-name="GFileInfo" get-type="g_file_info_get_type">
 			<method name="clear_status" symbol="g_file_info_clear_status">
@@ -1792,7 +1999,21 @@
 					<parameter name="stream" type="GFilterInputStream*"/>
 				</parameters>
 			</method>
+			<method name="get_close_base_stream" symbol="g_filter_input_stream_get_close_base_stream">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="stream" type="GFilterInputStream*"/>
+				</parameters>
+			</method>
+			<method name="set_close_base_stream" symbol="g_filter_input_stream_set_close_base_stream">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="stream" type="GFilterInputStream*"/>
+					<parameter name="close_base" type="gboolean"/>
+				</parameters>
+			</method>
 			<property name="base-stream" type="GInputStream*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="close-base-stream" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
 			<field name="base_stream" type="GInputStream*"/>
 		</object>
 		<object name="GFilterOutputStream" parent="GOutputStream" type-name="GFilterOutputStream" get-type="g_filter_output_stream_get_type">
@@ -1802,7 +2023,21 @@
 					<parameter name="stream" type="GFilterOutputStream*"/>
 				</parameters>
 			</method>
+			<method name="get_close_base_stream" symbol="g_filter_output_stream_get_close_base_stream">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="stream" type="GFilterOutputStream*"/>
+				</parameters>
+			</method>
+			<method name="set_close_base_stream" symbol="g_filter_output_stream_set_close_base_stream">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="stream" type="GFilterOutputStream*"/>
+					<parameter name="close_base" type="gboolean"/>
+				</parameters>
+			</method>
 			<property name="base-stream" type="GOutputStream*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="close-base-stream" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
 			<field name="base_stream" type="GOutputStream*"/>
 		</object>
 		<object name="GIOModule" parent="GTypeModule" type-name="GIOModule" get-type="g_io_module_get_type">
@@ -1828,6 +2063,161 @@
 				</parameters>
 			</method>
 		</object>
+		<object name="GInetAddress" parent="GObject" type-name="GInetAddress" get-type="g_inet_address_get_type">
+			<method name="get_family" symbol="g_inet_address_get_family">
+				<return-type type="GSocketFamily"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_is_any" symbol="g_inet_address_get_is_any">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_is_link_local" symbol="g_inet_address_get_is_link_local">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_is_loopback" symbol="g_inet_address_get_is_loopback">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_is_mc_global" symbol="g_inet_address_get_is_mc_global">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_is_mc_link_local" symbol="g_inet_address_get_is_mc_link_local">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_is_mc_node_local" symbol="g_inet_address_get_is_mc_node_local">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_is_mc_org_local" symbol="g_inet_address_get_is_mc_org_local">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_is_mc_site_local" symbol="g_inet_address_get_is_mc_site_local">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_is_multicast" symbol="g_inet_address_get_is_multicast">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_is_site_local" symbol="g_inet_address_get_is_site_local">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<constructor name="new_any" symbol="g_inet_address_new_any">
+				<return-type type="GInetAddress*"/>
+				<parameters>
+					<parameter name="family" type="GSocketFamily"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_from_bytes" symbol="g_inet_address_new_from_bytes">
+				<return-type type="GInetAddress*"/>
+				<parameters>
+					<parameter name="bytes" type="guint8*"/>
+					<parameter name="family" type="GSocketFamily"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_from_string" symbol="g_inet_address_new_from_string">
+				<return-type type="GInetAddress*"/>
+				<parameters>
+					<parameter name="string" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_loopback" symbol="g_inet_address_new_loopback">
+				<return-type type="GInetAddress*"/>
+				<parameters>
+					<parameter name="family" type="GSocketFamily"/>
+				</parameters>
+			</constructor>
+			<method name="to_bytes" symbol="g_inet_address_to_bytes">
+				<return-type type="guint8*"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<method name="to_string" symbol="g_inet_address_to_string">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</method>
+			<property name="bytes" type="gpointer" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="family" type="GSocketFamily" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="is-any" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="is-link-local" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="is-loopback" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="is-mc-global" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="is-mc-link-local" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="is-mc-node-local" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="is-mc-org-local" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="is-mc-site-local" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="is-multicast" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="is-site-local" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<vfunc name="to_bytes">
+				<return-type type="guint8*"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="to_string">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+				</parameters>
+			</vfunc>
+		</object>
+		<object name="GInetSocketAddress" parent="GSocketAddress" type-name="GInetSocketAddress" get-type="g_inet_socket_address_get_type">
+			<implements>
+				<interface name="GSocketConnectable"/>
+			</implements>
+			<method name="get_address" symbol="g_inet_socket_address_get_address">
+				<return-type type="GInetAddress*"/>
+				<parameters>
+					<parameter name="address" type="GInetSocketAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_port" symbol="g_inet_socket_address_get_port">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="address" type="GInetSocketAddress*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="g_inet_socket_address_new">
+				<return-type type="GSocketAddress*"/>
+				<parameters>
+					<parameter name="address" type="GInetAddress*"/>
+					<parameter name="port" type="guint16"/>
+				</parameters>
+			</constructor>
+			<property name="address" type="GInetAddress*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="port" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
+		</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"/>
@@ -2186,6 +2576,12 @@
 			<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="aborted" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="op" type="GMountOperation*"/>
+				</parameters>
+			</signal>
 			<signal name="ask-password" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -2221,6 +2617,66 @@
 				</parameters>
 			</vfunc>
 		</object>
+		<object name="GNetworkAddress" parent="GObject" type-name="GNetworkAddress" get-type="g_network_address_get_type">
+			<implements>
+				<interface name="GSocketConnectable"/>
+			</implements>
+			<method name="get_hostname" symbol="g_network_address_get_hostname">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="addr" type="GNetworkAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_port" symbol="g_network_address_get_port">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="addr" type="GNetworkAddress*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="g_network_address_new">
+				<return-type type="GSocketConnectable*"/>
+				<parameters>
+					<parameter name="hostname" type="gchar*"/>
+					<parameter name="port" type="guint16"/>
+				</parameters>
+			</constructor>
+			<property name="hostname" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="port" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
+		</object>
+		<object name="GNetworkService" parent="GObject" type-name="GNetworkService" get-type="g_network_service_get_type">
+			<implements>
+				<interface name="GSocketConnectable"/>
+			</implements>
+			<method name="get_domain" symbol="g_network_service_get_domain">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="srv" type="GNetworkService*"/>
+				</parameters>
+			</method>
+			<method name="get_protocol" symbol="g_network_service_get_protocol">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="srv" type="GNetworkService*"/>
+				</parameters>
+			</method>
+			<method name="get_service" symbol="g_network_service_get_service">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="srv" type="GNetworkService*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="g_network_service_new">
+				<return-type type="GSocketConnectable*"/>
+				<parameters>
+					<parameter name="service" type="gchar*"/>
+					<parameter name="protocol" type="gchar*"/>
+					<parameter name="domain" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<property name="domain" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="protocol" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="service" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+		</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"/>
@@ -2483,6 +2939,198 @@
 				</parameters>
 			</vfunc>
 		</object>
+		<object name="GResolver" parent="GObject" type-name="GResolver" get-type="g_resolver_get_type">
+			<method name="error_quark" symbol="g_resolver_error_quark">
+				<return-type type="GQuark"/>
+			</method>
+			<method name="free_addresses" symbol="g_resolver_free_addresses">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="addresses" type="GList*"/>
+				</parameters>
+			</method>
+			<method name="free_targets" symbol="g_resolver_free_targets">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="targets" type="GList*"/>
+				</parameters>
+			</method>
+			<method name="get_default" symbol="g_resolver_get_default">
+				<return-type type="GResolver*"/>
+			</method>
+			<method name="lookup_by_address" symbol="g_resolver_lookup_by_address">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="address" type="GInetAddress*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="lookup_by_address_async" symbol="g_resolver_lookup_by_address_async">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="address" type="GInetAddress*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="lookup_by_address_finish" symbol="g_resolver_lookup_by_address_finish">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="lookup_by_name" symbol="g_resolver_lookup_by_name">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="hostname" type="gchar*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="lookup_by_name_async" symbol="g_resolver_lookup_by_name_async">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="hostname" type="gchar*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="lookup_by_name_finish" symbol="g_resolver_lookup_by_name_finish">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="lookup_service" symbol="g_resolver_lookup_service">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="service" type="gchar*"/>
+					<parameter name="protocol" type="gchar*"/>
+					<parameter name="domain" type="gchar*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="lookup_service_async" symbol="g_resolver_lookup_service_async">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="service" type="gchar*"/>
+					<parameter name="protocol" type="gchar*"/>
+					<parameter name="domain" type="gchar*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="lookup_service_finish" symbol="g_resolver_lookup_service_finish">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="set_default" symbol="g_resolver_set_default">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+				</parameters>
+			</method>
+			<vfunc name="lookup_by_address">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="address" type="GInetAddress*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="lookup_by_address_async">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="address" type="GInetAddress*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="lookup_by_address_finish">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="lookup_by_name">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="hostname" type="gchar*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="lookup_by_name_async">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="hostname" type="gchar*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="lookup_by_name_finish">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="lookup_service">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="rrname" type="gchar*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="lookup_service_async">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="rrname" type="gchar*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="lookup_service_finish">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="resolver" type="GResolver*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<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>
 				<interface name="GAsyncResult"/>
@@ -2523,6 +3171,14 @@
 					<parameter name="simple" type="GSimpleAsyncResult*"/>
 				</parameters>
 			</method>
+			<method name="is_valid" symbol="g_simple_async_result_is_valid">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="source" type="GObject*"/>
+					<parameter name="source_tag" type="gpointer"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="g_simple_async_result_new">
 				<return-type type="GSimpleAsyncResult*"/>
 				<parameters>
@@ -2624,6 +3280,59 @@
 				</parameters>
 			</method>
 		</object>
+		<object name="GSocketAddress" parent="GObject" type-name="GSocketAddress" get-type="g_socket_address_get_type">
+			<implements>
+				<interface name="GSocketConnectable"/>
+			</implements>
+			<method name="get_family" symbol="g_socket_address_get_family">
+				<return-type type="GSocketFamily"/>
+				<parameters>
+					<parameter name="address" type="GSocketAddress*"/>
+				</parameters>
+			</method>
+			<method name="get_native_size" symbol="g_socket_address_get_native_size">
+				<return-type type="gssize"/>
+				<parameters>
+					<parameter name="address" type="GSocketAddress*"/>
+				</parameters>
+			</method>
+			<constructor name="new_from_native" symbol="g_socket_address_new_from_native">
+				<return-type type="GSocketAddress*"/>
+				<parameters>
+					<parameter name="native" type="gpointer"/>
+					<parameter name="len" type="gsize"/>
+				</parameters>
+			</constructor>
+			<method name="to_native" symbol="g_socket_address_to_native">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GSocketAddress*"/>
+					<parameter name="dest" type="gpointer"/>
+					<parameter name="destlen" type="gsize"/>
+				</parameters>
+			</method>
+			<property name="family" type="GSocketFamily" readable="1" writable="0" construct="0" construct-only="0"/>
+			<vfunc name="get_family">
+				<return-type type="GSocketFamily"/>
+				<parameters>
+					<parameter name="address" type="GSocketAddress*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_native_size">
+				<return-type type="gssize"/>
+				<parameters>
+					<parameter name="address" type="GSocketAddress*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="to_native">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="address" type="GSocketAddress*"/>
+					<parameter name="dest" type="gpointer"/>
+					<parameter name="destlen" type="gsize"/>
+				</parameters>
+			</vfunc>
+		</object>
 		<object name="GThemedIcon" parent="GObject" type-name="GThemedIcon" get-type="g_themed_icon_get_type">
 			<implements>
 				<interface name="GIcon"/>
@@ -2669,7 +3378,7 @@
 			</method>
 			<property name="name" type="char*" readable="0" writable="1" construct="0" construct-only="1"/>
 			<property name="names" type="GStrv*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="use-default-fallbacks" type="gboolean" readable="0" writable="1" construct="0" construct-only="1"/>
+			<property name="use-default-fallbacks" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
 		</object>
 		<object name="GVfs" parent="GObject" type-name="GVfs" get-type="g_vfs_get_type">
 			<method name="get_default" symbol="g_vfs_get_default">
@@ -2808,6 +3517,13 @@
 					<parameter name="drive" type="GDrive*"/>
 				</parameters>
 			</signal>
+			<signal name="drive-eject-button" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="volume_monitor" type="GVolumeMonitor*"/>
+					<parameter name="drive" type="GDrive*"/>
+				</parameters>
+			</signal>
 			<signal name="mount-added" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -2912,6 +3628,12 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="can_delete" symbol="g_app_info_can_delete">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="appinfo" type="GAppInfo*"/>
+				</parameters>
+			</method>
 			<method name="can_remove_supports_type" symbol="g_app_info_can_remove_supports_type">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -2927,6 +3649,12 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="delete" symbol="g_app_info_delete">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="appinfo" type="GAppInfo*"/>
+				</parameters>
+			</method>
 			<method name="dup" symbol="g_app_info_dup">
 				<return-type type="GAppInfo*"/>
 				<parameters>
@@ -2949,6 +3677,12 @@
 					<parameter name="content_type" type="char*"/>
 				</parameters>
 			</method>
+			<method name="get_commandline" symbol="g_app_info_get_commandline">
+				<return-type type="char*"/>
+				<parameters>
+					<parameter name="appinfo" type="GAppInfo*"/>
+				</parameters>
+			</method>
 			<method name="get_default_for_type" symbol="g_app_info_get_default_for_type">
 				<return-type type="GAppInfo*"/>
 				<parameters>
@@ -3026,6 +3760,12 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="reset_type_associations" symbol="g_app_info_reset_type_associations">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="content_type" type="char*"/>
+				</parameters>
+			</method>
 			<method name="set_as_default_for_extension" symbol="g_app_info_set_as_default_for_extension">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -3068,12 +3808,24 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="can_delete">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="appinfo" type="GAppInfo*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="can_remove_supports_type">
 				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="appinfo" type="GAppInfo*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="do_delete">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="appinfo" type="GAppInfo*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="dup">
 				<return-type type="GAppInfo*"/>
 				<parameters>
@@ -3087,6 +3839,12 @@
 					<parameter name="appinfo2" type="GAppInfo*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="get_commandline">
+				<return-type type="char*"/>
+				<parameters>
+					<parameter name="appinfo" type="GAppInfo*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="get_description">
 				<return-type type="char*"/>
 				<parameters>
@@ -3794,6 +4552,15 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="monitor" symbol="g_file_monitor">
+				<return-type type="GFileMonitor*"/>
+				<parameters>
+					<parameter name="file" type="GFile*"/>
+					<parameter name="flags" type="GFileMonitorFlags"/>
+					<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>
@@ -4831,6 +5598,19 @@
 					<parameter name="icon" type="gconstpointer"/>
 				</parameters>
 			</method>
+			<method name="new_for_string" symbol="g_icon_new_for_string">
+				<return-type type="GIcon*"/>
+				<parameters>
+					<parameter name="str" type="gchar*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="to_string" symbol="g_icon_to_string">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="icon" type="GIcon*"/>
+				</parameters>
+			</method>
 			<vfunc name="equal">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -4838,12 +5618,29 @@
 					<parameter name="icon2" type="GIcon*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="from_tokens">
+				<return-type type="GIcon*"/>
+				<parameters>
+					<parameter name="tokens" type="gchar**"/>
+					<parameter name="num_tokens" type="gint"/>
+					<parameter name="version" type="gint"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="hash">
 				<return-type type="guint"/>
 				<parameters>
 					<parameter name="icon" type="GIcon*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="to_tokens">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="icon" type="GIcon*"/>
+					<parameter name="tokens" type="GPtrArray*"/>
+					<parameter name="out_version" type="gint*"/>
+				</parameters>
+			</vfunc>
 		</interface>
 		<interface name="GLoadableIcon" type-name="GLoadableIcon" get-type="g_loadable_icon_get_type">
 			<requires>
@@ -4979,6 +5776,39 @@
 					<parameter name="mount" type="GMount*"/>
 				</parameters>
 			</method>
+			<method name="guess_content_type" symbol="g_mount_guess_content_type">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="mount" type="GMount*"/>
+					<parameter name="force_rescan" type="gboolean"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="guess_content_type_finish" symbol="g_mount_guess_content_type_finish">
+				<return-type type="gchar**"/>
+				<parameters>
+					<parameter name="mount" type="GMount*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="guess_content_type_sync" symbol="g_mount_guess_content_type_sync">
+				<return-type type="gchar**"/>
+				<parameters>
+					<parameter name="mount" type="GMount*"/>
+					<parameter name="force_rescan" type="gboolean"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="is_shadowed" symbol="g_mount_is_shadowed">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="mount" type="GMount*"/>
+				</parameters>
+			</method>
 			<method name="remount" symbol="g_mount_remount">
 				<return-type type="void"/>
 				<parameters>
@@ -4998,6 +5828,12 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="shadow" symbol="g_mount_shadow">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="mount" type="GMount*"/>
+				</parameters>
+			</method>
 			<method name="unmount" symbol="g_mount_unmount">
 				<return-type type="void"/>
 				<parameters>
@@ -5016,6 +5852,12 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="unshadow" symbol="g_mount_unshadow">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="mount" type="GMount*"/>
+				</parameters>
+			</method>
 			<signal name="changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -5094,6 +5936,33 @@
 					<parameter name="mount" type="GMount*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="guess_content_type">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="mount" type="GMount*"/>
+					<parameter name="force_rescan" type="gboolean"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="guess_content_type_finish">
+				<return-type type="gchar**"/>
+				<parameters>
+					<parameter name="mount" type="GMount*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="guess_content_type_sync">
+				<return-type type="gchar**"/>
+				<parameters>
+					<parameter name="mount" type="GMount*"/>
+					<parameter name="force_rescan" type="gboolean"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="remount">
 				<return-type type="void"/>
 				<parameters>
@@ -5211,6 +6080,73 @@
 				</parameters>
 			</vfunc>
 		</interface>
+		<interface name="GSocketConnectable" type-name="GSocketConnectable" get-type="g_socket_connectable_get_type">
+			<requires>
+				<interface name="GObject"/>
+			</requires>
+			<method name="get_next" symbol="g_socket_connectable_get_next">
+				<return-type type="GSocketAddress*"/>
+				<parameters>
+					<parameter name="connectable" type="GSocketConnectable*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="get_next_async" symbol="g_socket_connectable_get_next_async">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="connectable" type="GSocketConnectable*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="get_next_finish" symbol="g_socket_connectable_get_next_finish">
+				<return-type type="GSocketAddress*"/>
+				<parameters>
+					<parameter name="connectable" type="GSocketConnectable*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="reset" symbol="g_socket_connectable_reset">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="connectable" type="GSocketConnectable*"/>
+				</parameters>
+			</method>
+			<vfunc name="get_next">
+				<return-type type="GSocketAddress*"/>
+				<parameters>
+					<parameter name="connectable" type="GSocketConnectable*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_next_async">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="connectable" type="GSocketConnectable*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_next_finish">
+				<return-type type="GSocketAddress*"/>
+				<parameters>
+					<parameter name="connectable" type="GSocketConnectable*"/>
+					<parameter name="result" type="GAsyncResult*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="reset">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="connectable" type="GSocketConnectable*"/>
+				</parameters>
+			</vfunc>
+		</interface>
 		<interface name="GVolume" type-name="GVolume" get-type="g_volume_get_type">
 			<requires>
 				<interface name="GObject"/>
@@ -5251,6 +6187,12 @@
 					<parameter name="volume" type="GVolume*"/>
 				</parameters>
 			</method>
+			<method name="get_activation_root" symbol="g_volume_get_activation_root">
+				<return-type type="GFile*"/>
+				<parameters>
+					<parameter name="volume" type="GVolume*"/>
+				</parameters>
+			</method>
 			<method name="get_drive" symbol="g_volume_get_drive">
 				<return-type type="GDrive*"/>
 				<parameters>
@@ -5361,6 +6303,12 @@
 					<parameter name="volume" type="GVolume*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="get_activation_root">
+				<return-type type="GFile*"/>
+				<parameters>
+					<parameter name="volume" type="GVolume*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="get_drive">
 				<return-type type="GDrive*"/>
 				<parameters>
@@ -5449,7 +6397,9 @@
 		<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_PREVIEW_ICON" type="char*" value="preview::icon"/>
 		<constant name="G_FILE_ATTRIBUTE_SELINUX_CONTEXT" type="char*" value="selinux::context"/>
+		<constant name="G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE" type="char*" value="standard::allocated-size"/>
 		<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_DESCRIPTION" type="char*" value="standard::description"/>
diff --git a/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi b/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
index b9ab9b0..7166e2c 100644
--- a/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
+++ b/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
@@ -200,6 +200,12 @@
 					<parameter name="filename" type="char*"/>
 				</parameters>
 			</constructor>
+			<constructor name="new_from_keyfile" symbol="g_desktop_app_info_new_from_keyfile">
+				<return-type type="GDesktopAppInfo*"/>
+				<parameters>
+					<parameter name="key_file" type="GKeyFile*"/>
+				</parameters>
+			</constructor>
 			<method name="set_desktop_env" symbol="g_desktop_app_info_set_desktop_env">
 				<return-type type="void"/>
 				<parameters>
@@ -208,13 +214,34 @@
 			</method>
 		</object>
 		<object name="GUnixInputStream" parent="GInputStream" type-name="GUnixInputStream" get-type="g_unix_input_stream_get_type">
+			<method name="get_close_fd" symbol="g_unix_input_stream_get_close_fd">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="stream" type="GUnixInputStream*"/>
+				</parameters>
+			</method>
+			<method name="get_fd" symbol="g_unix_input_stream_get_fd">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="stream" type="GUnixInputStream*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="g_unix_input_stream_new">
 				<return-type type="GInputStream*"/>
 				<parameters>
-					<parameter name="fd" type="int"/>
-					<parameter name="close_fd_at_close" type="gboolean"/>
+					<parameter name="fd" type="gint"/>
+					<parameter name="close_fd" type="gboolean"/>
 				</parameters>
 			</constructor>
+			<method name="set_close_fd" symbol="g_unix_input_stream_set_close_fd">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="stream" type="GUnixInputStream*"/>
+					<parameter name="close_fd" type="gboolean"/>
+				</parameters>
+			</method>
+			<property name="close-fd" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="fd" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
 		</object>
 		<object name="GUnixMountMonitor" parent="GObject" type-name="GUnixMountMonitor" get-type="g_unix_mount_monitor_get_type">
 			<constructor name="new" symbol="g_unix_mount_monitor_new">
@@ -241,13 +268,46 @@
 			</signal>
 		</object>
 		<object name="GUnixOutputStream" parent="GOutputStream" type-name="GUnixOutputStream" get-type="g_unix_output_stream_get_type">
+			<method name="get_close_fd" symbol="g_unix_output_stream_get_close_fd">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="stream" type="GUnixOutputStream*"/>
+				</parameters>
+			</method>
+			<method name="get_fd" symbol="g_unix_output_stream_get_fd">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="stream" type="GUnixOutputStream*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="g_unix_output_stream_new">
 				<return-type type="GOutputStream*"/>
 				<parameters>
-					<parameter name="fd" type="int"/>
-					<parameter name="close_fd_at_close" type="gboolean"/>
+					<parameter name="fd" type="gint"/>
+					<parameter name="close_fd" type="gboolean"/>
+				</parameters>
+			</constructor>
+			<method name="set_close_fd" symbol="g_unix_output_stream_set_close_fd">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="stream" type="GUnixOutputStream*"/>
+					<parameter name="close_fd" type="gboolean"/>
+				</parameters>
+			</method>
+			<property name="close-fd" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="fd" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
+		</object>
+		<object name="GUnixSocketAddress" parent="GSocketAddress" type-name="GUnixSocketAddress" get-type="g_unix_socket_address_get_type">
+			<implements>
+				<interface name="GSocketConnectable"/>
+			</implements>
+			<constructor name="new" symbol="g_unix_socket_address_new">
+				<return-type type="GSocketAddress*"/>
+				<parameters>
+					<parameter name="path" type="gchar*"/>
 				</parameters>
 			</constructor>
+			<property name="path" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
 		</object>
 		<interface name="GDesktopAppInfoLookup" type-name="GDesktopAppInfoLookup" get-type="g_desktop_app_info_lookup_get_type">
 			<requires>
