[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header
[platform/upstream/glib.git] / gio / gfile.c
index 171cc3f..3e2607c 100644 (file)
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
 #include "config.h"
+
+#ifdef __linux__
+#include <sys/ioctl.h>
+#include <errno.h>
+/* See linux.git/fs/btrfs/ioctl.h */
+#define BTRFS_IOCTL_MAGIC 0x94
+#define BTRFS_IOC_CLONE _IOW(BTRFS_IOCTL_MAGIC, 9, int)
+#endif
+
 #ifdef HAVE_SPLICE
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #endif
+
 #include <string.h>
 #include <sys/types.h>
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
+
 #include "gfile.h"
+#include "glib/gstdio.h"
+#ifdef G_OS_UNIX
+#include "glib-unix.h"
+#endif
 #include "gvfs.h"
-#include "gioscheduler.h"
-#include "gsimpleasyncresult.h"
+#include "gtask.h"
 #include "gfileattribute-priv.h"
 #include "gfiledescriptorbased.h"
 #include "gpollfilemonitor.h"
@@ -46,6 +55,7 @@
 #include "gfileoutputstream.h"
 #include "glocalfileoutputstream.h"
 #include "glocalfileiostream.h"
+#include "glocalfile.h"
 #include "gcancellable.h"
 #include "gasyncresult.h"
 #include "gioerror.h"
  * @short_description: File and Directory Handling
  * @include: gio/gio.h
  * @see_also: #GFileInfo, #GFileEnumerator
- * 
- * #GFile is a high level abstraction for manipulating files on a 
- * virtual file system. #GFile<!-- -->s are lightweight, immutable 
- * objects that do no I/O upon creation. It is necessary to understand that
- * #GFile objects do not represent files, merely an identifier for a file. All
- * file content I/O is implemented as streaming operations (see #GInputStream and 
- * #GOutputStream).
- *
- * To construct a #GFile, you can use: 
- * g_file_new_for_path() if you have a path.
- * g_file_new_for_uri() if you have a URI.
- * g_file_new_for_commandline_arg() for a command line argument.
- * g_file_new_tmp() to create a temporary file from a template.
- * g_file_parse_name() from a utf8 string gotten from g_file_get_parse_name().
- * 
- * One way to think of a #GFile is as an abstraction of a pathname. For normal
- * files the system pathname is what is stored internally, but as #GFile<!-- -->s
- * are extensible it could also be something else that corresponds to a pathname
- * in a userspace implementation of a filesystem.
- *
- * #GFile<!-- -->s make up hierarchies of directories and files that correspond to the
- * files on a filesystem. You can move through the file system with #GFile using
- * g_file_get_parent() to get an identifier for the parent directory, g_file_get_child()
- * to get a child within a directory, g_file_resolve_relative_path() to resolve a relative
- * path between two #GFile<!-- -->s. There can be multiple hierarchies, so you may not
- * end up at the same root if you repeatedly call g_file_get_parent() on two different
+ *
+ * #GFile is a high level abstraction for manipulating files on a
+ * virtual file system. #GFiles are lightweight, immutable objects
+ * that do no I/O upon creation. It is necessary to understand that
+ * #GFile objects do not represent files, merely an identifier for a
+ * file. All file content I/O is implemented as streaming operations
+ * (see #GInputStream and #GOutputStream).
+ *
+ * To construct a #GFile, you can use:
+ * - g_file_new_for_path() if you have a path.
+ * - g_file_new_for_uri() if you have a URI.
+ * - g_file_new_for_commandline_arg() for a command line argument.
+ * - g_file_new_tmp() to create a temporary file from a template.
+ * - g_file_parse_name() from a UTF-8 string gotten from g_file_get_parse_name().
+ *
+ * One way to think of a #GFile is as an abstraction of a pathname. For
+ * normal files the system pathname is what is stored internally, but as
+ * #GFiles are extensible it could also be something else that corresponds
+ * to a pathname in a userspace implementation of a filesystem.
+ *
+ * #GFiles make up hierarchies of directories and files that correspond to
+ * the files on a filesystem. You can move through the file system with
+ * #GFile using g_file_get_parent() to get an identifier for the parent
+ * directory, g_file_get_child() to get a child within a directory,
+ * g_file_resolve_relative_path() to resolve a relative path between two
+ * #GFiles. There can be multiple hierarchies, so you may not end up at
+ * the same root if you repeatedly call g_file_get_parent() on two different
  * files.
  *
- * All #GFile<!-- -->s have a basename (get with g_file_get_basename()). These names
- * are byte strings that are used to identify the file on the filesystem (relative to
- * its parent directory) and there is no guarantees that they have any particular charset
- * encoding or even make any sense at all. If you want to use filenames in a user
- * interface you should use the display name that you can get by requesting the
+ * All #GFiles have a basename (get with g_file_get_basename()). These names
+ * are byte strings that are used to identify the file on the filesystem
+ * (relative to its parent directory) and there is no guarantees that they
+ * have any particular charset encoding or even make any sense at all. If
+ * you want to use filenames in a user interface you should use the display
+ * name that you can get by requesting the
  * %G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME attribute with g_file_query_info().
- * This is guaranteed to be in utf8 and can be used in a user interface. But always
- * store the real basename or the #GFile to use to actually access the file, because
- * there is no way to go from a display name to the actual name.
- *
- * Using #GFile as an identifier has the same weaknesses as using a path in that
- * there may be multiple aliases for the same file. For instance, hard or
- * soft links may cause two different #GFile<!-- -->s to refer to the same file.
- * Other possible causes for aliases are: case insensitive filesystems, short
- * and long names on Fat/NTFS, or bind mounts in Linux. If you want to check if
- * two #GFile<!-- -->s point to the same file you can query for the
+ * This is guaranteed to be in UTF-8 and can be used in a user interface.
+ * But always store the real basename or the #GFile to use to actually
+ * access the file, because there is no way to go from a display name to
+ * the actual name.
+ *
+ * Using #GFile as an identifier has the same weaknesses as using a path
+ * in that there may be multiple aliases for the same file. For instance,
+ * hard or soft links may cause two different #GFiles to refer to the same
+ * file. Other possible causes for aliases are: case insensitive filesystems,
+ * short and long names on FAT/NTFS, or bind mounts in Linux. If you want to
+ * check if two #GFiles point to the same file you can query for the
  * %G_FILE_ATTRIBUTE_ID_FILE attribute. Note that #GFile does some trivial
- * canonicalization of pathnames passed in, so that trivial differences in the
- * path string used at creation (duplicated slashes, slash at end of path, "."
- * or ".." path segments, etc) does not create different #GFile<!-- -->s.
- * 
- * Many #GFile operations have both synchronous and asynchronous versions 
- * to suit your application. Asynchronous versions of synchronous functions 
- * simply have _async() appended to their function names. The asynchronous 
- * I/O functions call a #GAsyncReadyCallback which is then used to finalize 
- * the operation, producing a GAsyncResult which is then passed to the 
- * function's matching _finish() operation. 
+ * canonicalization of pathnames passed in, so that trivial differences in
+ * the path string used at creation (duplicated slashes, slash at end of
+ * path, "." or ".." path segments, etc) does not create different #GFiles.
+ *
+ * Many #GFile operations have both synchronous and asynchronous versions
+ * to suit your application. Asynchronous versions of synchronous functions
+ * simply have _async() appended to their function names. The asynchronous
+ * I/O functions call a #GAsyncReadyCallback which is then used to finalize
+ * the operation, producing a GAsyncResult which is then passed to the
+ * function's matching _finish() operation.
  *
  * Some #GFile operations do not have synchronous analogs, as they may
  * take a very long time to finish, and blocking may leave an application
  * unusable. Notable cases include:
- * g_file_mount_mountable() to mount a mountable file.
- * g_file_unmount_mountable_with_operation() to unmount a mountable file.
- * g_file_eject_mountable_with_operation() to eject a mountable file.
- * 
- * <para id="gfile-etag"><indexterm><primary>entity tag</primary></indexterm>
- * One notable feature of #GFile<!-- -->s are entity tags, or "etags" for 
- * short. Entity tags are somewhat like a more abstract version of the 
- * traditional mtime, and can be used to quickly determine if the file has
- * been modified from the version on the file system. See the HTTP 1.1 
- * <ulink url="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html">specification</ulink>
+ * - g_file_mount_mountable() to mount a mountable file.
+ * - g_file_unmount_mountable_with_operation() to unmount a mountable file.
+ * - g_file_eject_mountable_with_operation() to eject a mountable file.
+ *
+ * ## Entity Tags # {#gfile-etag}
+ *
+ * One notable feature of #GFiles are entity tags, or "etags" for
+ * short. Entity tags are somewhat like a more abstract version of the
+ * traditional mtime, and can be used to quickly determine if the file
+ * has been modified from the version on the file system. See the
+ * HTTP 1.1 
+ * [specification](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html)
  * for HTTP Etag headers, which are a very similar concept.
- * </para>
- **/
+ */
 
 static void               g_file_real_query_info_async            (GFile                  *file,
-                                                                  const char             *attributes,
-                                                                  GFileQueryInfoFlags     flags,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   const char             *attributes,
+                                                                   GFileQueryInfoFlags     flags,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static GFileInfo *        g_file_real_query_info_finish           (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
 static void               g_file_real_query_filesystem_info_async (GFile                  *file,
-                                                                  const char             *attributes,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   const char             *attributes,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static GFileInfo *        g_file_real_query_filesystem_info_finish (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
 static void               g_file_real_enumerate_children_async    (GFile                  *file,
-                                                                  const char             *attributes,
-                                                                  GFileQueryInfoFlags     flags,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   const char             *attributes,
+                                                                   GFileQueryInfoFlags     flags,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static GFileEnumerator *  g_file_real_enumerate_children_finish   (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
 static void               g_file_real_read_async                  (GFile                  *file,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static GFileInputStream * g_file_real_read_finish                 (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
 static void               g_file_real_append_to_async             (GFile                  *file,
-                                                                  GFileCreateFlags        flags,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   GFileCreateFlags        flags,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static GFileOutputStream *g_file_real_append_to_finish            (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
 static void               g_file_real_create_async                (GFile                  *file,
-                                                                  GFileCreateFlags        flags,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   GFileCreateFlags        flags,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static GFileOutputStream *g_file_real_create_finish               (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
 static void               g_file_real_replace_async               (GFile                  *file,
-                                                                  const char             *etag,
-                                                                  gboolean                make_backup,
-                                                                  GFileCreateFlags        flags,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   const char             *etag,
+                                                                   gboolean                make_backup,
+                                                                   GFileCreateFlags        flags,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static GFileOutputStream *g_file_real_replace_finish              (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
+static void               g_file_real_delete_async                (GFile                  *file,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
+static gboolean           g_file_real_delete_finish               (GFile                  *file,
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
+static void               g_file_real_trash_async                 (GFile                  *file,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
+static gboolean           g_file_real_trash_finish                (GFile                  *file,
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
+static void               g_file_real_make_directory_async        (GFile                  *file,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
+static gboolean           g_file_real_make_directory_finish       (GFile                  *file,
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
 static void               g_file_real_open_readwrite_async        (GFile                  *file,
                                                                    int                  io_priority,
                                                                    GCancellable           *cancellable,
@@ -225,50 +263,74 @@ static GFileIOStream *    g_file_real_replace_readwrite_finish    (GFile
                                                                   GAsyncResult            *res,
                                                                   GError                 **error);
 static gboolean           g_file_real_set_attributes_from_info    (GFile                  *file,
-                                                                  GFileInfo              *info,
-                                                                  GFileQueryInfoFlags     flags,
-                                                                  GCancellable           *cancellable,
-                                                                  GError                **error);
+                                                                   GFileInfo              *info,
+                                                                   GFileQueryInfoFlags     flags,
+                                                                   GCancellable           *cancellable,
+                                                                   GError                **error);
 static void               g_file_real_set_display_name_async      (GFile                  *file,
-                                                                  const char             *display_name,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   const char             *display_name,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static GFile *            g_file_real_set_display_name_finish     (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
 static void               g_file_real_set_attributes_async        (GFile                  *file,
-                                                                  GFileInfo              *info,
-                                                                  GFileQueryInfoFlags     flags,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   GFileInfo              *info,
+                                                                   GFileQueryInfoFlags     flags,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static gboolean           g_file_real_set_attributes_finish       (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GFileInfo             **info,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GFileInfo             **info,
+                                                                   GError                **error);
 static void               g_file_real_find_enclosing_mount_async  (GFile                  *file,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static GMount *           g_file_real_find_enclosing_mount_finish (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
 static void               g_file_real_copy_async                  (GFile                  *source,
-                                                                  GFile                  *destination,
-                                                                  GFileCopyFlags          flags,
-                                                                  int                     io_priority,
-                                                                  GCancellable           *cancellable,
-                                                                  GFileProgressCallback   progress_callback,
-                                                                  gpointer                progress_callback_data,
-                                                                  GAsyncReadyCallback     callback,
-                                                                  gpointer                user_data);
+                                                                   GFile                  *destination,
+                                                                   GFileCopyFlags          flags,
+                                                                   int                     io_priority,
+                                                                   GCancellable           *cancellable,
+                                                                   GFileProgressCallback   progress_callback,
+                                                                   gpointer                progress_callback_data,
+                                                                   GAsyncReadyCallback     callback,
+                                                                   gpointer                user_data);
 static gboolean           g_file_real_copy_finish                 (GFile                  *file,
-                                                                  GAsyncResult           *res,
-                                                                  GError                **error);
+                                                                   GAsyncResult           *res,
+                                                                   GError                **error);
+
+static gboolean           g_file_real_measure_disk_usage          (GFile                         *file,
+                                                                   GFileMeasureFlags              flags,
+                                                                   GCancellable                  *cancellable,
+                                                                   GFileMeasureProgressCallback   progress_callback,
+                                                                   gpointer                       progress_data,
+                                                                   guint64                       *disk_usage,
+                                                                   guint64                       *num_dirs,
+                                                                   guint64                       *num_files,
+                                                                   GError                       **error);
+static void               g_file_real_measure_disk_usage_async    (GFile                         *file,
+                                                                   GFileMeasureFlags              flags,
+                                                                   gint                           io_priority,
+                                                                   GCancellable                  *cancellable,
+                                                                   GFileMeasureProgressCallback   progress_callback,
+                                                                   gpointer                       progress_data,
+                                                                   GAsyncReadyCallback            callback,
+                                                                   gpointer                       user_data);
+static gboolean           g_file_real_measure_disk_usage_finish   (GFile                         *file,
+                                                                   GAsyncResult                  *result,
+                                                                   guint64                       *disk_usage,
+                                                                   guint64                       *num_dirs,
+                                                                   guint64                       *num_files,
+                                                                   GError                       **error);
 
 typedef GFileIface GFileInterface;
 G_DEFINE_INTERFACE (GFile, g_file, G_TYPE_OBJECT)
@@ -294,6 +356,12 @@ g_file_default_init (GFileIface *iface)
   iface->create_finish = g_file_real_create_finish;
   iface->replace_async = g_file_real_replace_async;
   iface->replace_finish = g_file_real_replace_finish;
+  iface->delete_file_async = g_file_real_delete_async;
+  iface->delete_file_finish = g_file_real_delete_finish;
+  iface->trash_async = g_file_real_trash_async;
+  iface->trash_finish = g_file_real_trash_finish;
+  iface->make_directory_async = g_file_real_make_directory_async;
+  iface->make_directory_finish = g_file_real_make_directory_finish;
   iface->open_readwrite_async = g_file_real_open_readwrite_async;
   iface->open_readwrite_finish = g_file_real_open_readwrite_finish;
   iface->create_readwrite_async = g_file_real_create_readwrite_async;
@@ -305,12 +373,15 @@ g_file_default_init (GFileIface *iface)
   iface->set_attributes_from_info = g_file_real_set_attributes_from_info;
   iface->copy_async = g_file_real_copy_async;
   iface->copy_finish = g_file_real_copy_finish;
+  iface->measure_disk_usage = g_file_real_measure_disk_usage;
+  iface->measure_disk_usage_async = g_file_real_measure_disk_usage_async;
+  iface->measure_disk_usage_finish = g_file_real_measure_disk_usage_finish;
 }
 
 
 /**
  * g_file_is_native:
- * @file: input #GFile.
+ * @file: input #GFile
  *
  * Checks to see if a file is native to the platform.
  *
@@ -318,15 +389,14 @@ g_file_default_init (GFileIface *iface)
  * e.g. "C:\Windows" or "/usr/bin/". This does not mean the file is local,
  * as it might be on a locally mounted remote filesystem.
  *
- * On some systems non-native files may be available using
- * the native filesystem via a userspace filesystem (FUSE), in
- * these cases this call will return %FALSE, but g_file_get_path()
- * will still return a native path.
+ * On some systems non-native files may be available using the native
+ * filesystem via a userspace filesystem (FUSE), in these cases this call
+ * will return %FALSE, but g_file_get_path() will still return a native path.
  *
- * This call does no blocking i/o.
- * 
- * Returns: %TRUE if file is native. 
- **/
+ * This call does no blocking I/O.
+ *
+ * Returns: %TRUE if @file is native
+ */
 gboolean
 g_file_is_native (GFile *file)
 {
@@ -341,24 +411,24 @@ g_file_is_native (GFile *file)
 
 
 /**
- * g_file_has_uri_scheme: 
- * @file: input #GFile.
- * @uri_scheme: a string containing a URI scheme.
+ * g_file_has_uri_scheme:
+ * @file: input #GFile
+ * @uri_scheme: a string containing a URI scheme
  *
  * Checks to see if a #GFile has a given URI scheme.
  *
- * This call does no blocking i/o.
- * 
+ * This call does no blocking I/O.
+ *
  * Returns: %TRUE if #GFile's backend supports the
  *     given URI scheme, %FALSE if URI scheme is %NULL,
  *     not supported, or #GFile is invalid.
- **/
+ */
 gboolean
 g_file_has_uri_scheme (GFile      *file,
-                      const char *uri_scheme)
+                       const char *uri_scheme)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (uri_scheme != NULL, FALSE);
 
@@ -370,21 +440,21 @@ g_file_has_uri_scheme (GFile      *file,
 
 /**
  * g_file_get_uri_scheme:
- * @file: input #GFile.
+ * @file: input #GFile
  *
  * Gets the URI scheme for a #GFile.
  * RFC 3986 decodes the scheme as:
- * <programlisting>
- * URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ] 
- * </programlisting>
- * Common schemes include "file", "http", "ftp", etc. 
+ * |[
+ * URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+ * ]|
+ * Common schemes include "file", "http", "ftp", etc.
  *
- * This call does no blocking i/o.
- * 
- * Returns: a string containing the URI scheme for the given 
- *     #GFile. The returned string should be freed with g_free() 
+ * This call does no blocking I/O.
+ *
+ * Returns: a string containing the URI scheme for the given
+ *     #GFile. The returned string should be freed with g_free()
  *     when no longer needed.
- **/
+ */
 char *
 g_file_get_uri_scheme (GFile *file)
 {
@@ -400,7 +470,7 @@ g_file_get_uri_scheme (GFile *file)
 
 /**
  * g_file_get_basename:
- * @file: input #GFile.
+ * @file: input #GFile
  *
  * Gets the base name (the last component of the path) for a given #GFile.
  *
@@ -408,23 +478,23 @@ g_file_get_uri_scheme (GFile *file)
  * or a uri like sftp://host/) it will return a single directory separator
  * (and on Windows, possibly a drive letter).
  *
- * The base name is a byte string (*not* UTF-8). It has no defined encoding
+ * The base name is a byte string (not UTF-8). It has no defined encoding
  * or rules other than it may not contain zero bytes.  If you want to use
  * filenames in a user interface you should use the display name that you
  * can get by requesting the %G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME
  * attribute with g_file_query_info().
- * 
- * This call does no blocking i/o.
- * 
- * Returns: string containing the #GFile's base name, or %NULL 
- *     if given #GFile is invalid. The returned string should be 
+ *
+ * This call does no blocking I/O.
+ *
+ * Returns: (nullable): string containing the #GFile's base name, or
+ *     %NULL if given #GFile is invalid. The returned string should be
  *     freed with g_free() when no longer needed.
- **/
+ */
 char *
 g_file_get_basename (GFile *file)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   iface = G_FILE_GET_IFACE (file);
@@ -434,16 +504,16 @@ g_file_get_basename (GFile *file)
 
 /**
  * g_file_get_path:
- * @file: input #GFile.
+ * @file: input #GFile
  *
- * Gets the local pathname for #GFile, if one exists. 
+ * Gets the local pathname for #GFile, if one exists.
  *
- * This call does no blocking i/o.
- * 
- * Returns: string containing the #GFile's path, or %NULL if 
- *     no such path exists. The returned string should be 
- *     freed with g_free() when no longer needed.
- **/
+ * This call does no blocking I/O.
+ *
+ * Returns: (nullable): string containing the #GFile's path, or %NULL
+ *     if no such path exists. The returned string should be freed
+ *     with g_free() when no longer needed.
+ */
 char *
 g_file_get_path (GFile *file)
 {
@@ -458,20 +528,21 @@ g_file_get_path (GFile *file)
 
 /**
  * g_file_get_uri:
- * @file: input #GFile.
+ * @file: input #GFile
  *
  * Gets the URI for the @file.
  *
- * This call does no blocking i/o.
- * 
+ * This call does no blocking I/O.
+ *
  * Returns: a string containing the #GFile's URI.
- *     The returned string should be freed with g_free() when no longer needed.
- **/
+ *     The returned string should be freed with g_free()
+ *     when no longer needed.
+ */
 char *
 g_file_get_uri (GFile *file)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   iface = G_FILE_GET_IFACE (file);
@@ -481,7 +552,7 @@ g_file_get_uri (GFile *file)
 
 /**
  * g_file_get_parse_name:
- * @file: input #GFile.
+ * @file: input #GFile
  *
  * Gets the parse name of the @file.
  * A parse name is a UTF-8 string that describes the
@@ -493,19 +564,20 @@ g_file_get_uri (GFile *file)
  * like in a location entry.
  *
  * For local files with names that can safely be converted
- * to UTF8 the pathname is used, otherwise the IRI is used
- * (a form of URI that allows UTF8 characters unescaped).
+ * to UTF-8 the pathname is used, otherwise the IRI is used
+ * (a form of URI that allows UTF-8 characters unescaped).
  *
- * This call does no blocking i/o.
- * 
- * Returns: a string containing the #GFile's parse name. The returned 
- *     string should be freed with g_free() when no longer needed.
- **/
+ * This call does no blocking I/O.
+ *
+ * Returns: a string containing the #GFile's parse name.
+ *     The returned string should be freed with g_free()
+ *     when no longer needed.
+ */
 char *
 g_file_get_parse_name (GFile *file)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   iface = G_FILE_GET_IFACE (file);
@@ -515,21 +587,22 @@ g_file_get_parse_name (GFile *file)
 
 /**
  * g_file_dup:
- * @file: input #GFile.
+ * @file: input #GFile
  *
- * Duplicates a #GFile handle. This operation does not duplicate 
- * the actual file or directory represented by the #GFile; see 
- * g_file_copy() if attempting to copy a file. 
+ * Duplicates a #GFile handle. This operation does not duplicate
+ * the actual file or directory represented by the #GFile; see
+ * g_file_copy() if attempting to copy a file.
  *
- * This call does no blocking i/o.
- * 
- * Returns: (transfer full): a new #GFile that is a duplicate of the given #GFile. 
- **/
+ * This call does no blocking I/O.
+ *
+ * Returns: (transfer full): a new #GFile that is a duplicate
+ *     of the given #GFile.
+ */
 GFile *
 g_file_dup (GFile *file)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   iface = G_FILE_GET_IFACE (file);
@@ -539,23 +612,23 @@ g_file_dup (GFile *file)
 
 /**
  * g_file_hash:
- * @file: (type GFile): #gconstpointer to a #GFile.
+ * @file: (type GFile): #gconstpointer to a #GFile
  *
  * Creates a hash value for a #GFile.
  *
- * This call does no blocking i/o.
+ * This call does no blocking I/O.
  *
  * Virtual: hash
- * Returns: 0 if @file is not a valid #GFile, otherwise an 
- *     integer that can be used as hash value for the #GFile. 
- *     This function is intended for easily hashing a #GFile to 
+ * Returns: 0 if @file is not a valid #GFile, otherwise an
+ *     integer that can be used as hash value for the #GFile.
+ *     This function is intended for easily hashing a #GFile to
  *     add to a #GHashTable or similar data structure.
- **/
+ */
 guint
 g_file_hash (gconstpointer file)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), 0);
 
   iface = G_FILE_GET_IFACE (file);
@@ -565,56 +638,59 @@ g_file_hash (gconstpointer file)
 
 /**
  * g_file_equal:
- * @file1: the first #GFile.
- * @file2: the second #GFile.
+ * @file1: the first #GFile
+ * @file2: the second #GFile
+ *
+ * Checks if the two given #GFiles refer to the same file.
  *
- * Checks equality of two given #GFile<!-- -->s. Note that two
- * #GFile<!-- -->s that differ can still refer to the same
+ * Note that two #GFiles that differ can still refer to the same
  * file on the filesystem due to various forms of filename
  * aliasing.
  *
- * This call does no blocking i/o.
- * 
+ * This call does no blocking I/O.
+ *
  * Returns: %TRUE if @file1 and @file2 are equal.
- *     %FALSE if either is not a #GFile.
- **/
+ */
 gboolean
 g_file_equal (GFile *file1,
-             GFile *file2)
+              GFile *file2)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file1), FALSE);
   g_return_val_if_fail (G_IS_FILE (file2), FALSE);
-  
+
+  if (file1 == file2)
+    return TRUE;
+
   if (G_TYPE_FROM_INSTANCE (file1) != G_TYPE_FROM_INSTANCE (file2))
     return FALSE;
 
   iface = G_FILE_GET_IFACE (file1);
-  
+
   return (* iface->equal) (file1, file2);
 }
 
 
 /**
  * g_file_get_parent:
- * @file: input #GFile.
+ * @file: input #GFile
  *
- * Gets the parent directory for the @file. 
- * If the @file represents the root directory of the 
+ * Gets the parent directory for the @file.
+ * If the @file represents the root directory of the
  * file system, then %NULL will be returned.
  *
- * This call does no blocking i/o.
- * 
- * Returns: (transfer full): a #GFile structure to the parent of the given
- *     #GFile or %NULL if there is no parent. 
- *     Free the returned object with g_object_unref().
- **/
+ * This call does no blocking I/O.
+ *
+ * Returns: (nullable) (transfer full): a #GFile structure to the
+ *     parent of the given #GFile or %NULL if there is no parent. Free
+ *     the returned object with g_object_unref().
+ */
 GFile *
 g_file_get_parent (GFile *file)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   iface = G_FILE_GET_IFACE (file);
@@ -625,7 +701,7 @@ g_file_get_parent (GFile *file)
 /**
  * g_file_has_parent:
  * @file: input #GFile
- * @parent: the parent to check for, or %NULL
+ * @parent: (allow-none): the parent to check for, or %NULL
  *
  * Checks if @file has a parent, and optionally, if it is @parent.
  *
@@ -637,7 +713,7 @@ g_file_get_parent (GFile *file)
  *          case that @parent is %NULL).
  *
  * Since: 2.24
- **/
+ */
 gboolean
 g_file_has_parent (GFile *file,
                    GFile *parent)
@@ -667,8 +743,8 @@ g_file_has_parent (GFile *file,
 
 /**
  * g_file_get_child:
- * @file: input #GFile.
- * @name: string containing the child's basename.
+ * @file: input #GFile
+ * @name: string containing the child's basename
  *
  * Gets a child of @file with basename equal to @name.
  *
@@ -676,14 +752,14 @@ g_file_has_parent (GFile *file,
  * you can still have a #GFile that points to it. You can use this
  * for instance to create that file.
  *
- * This call does no blocking i/o.
- * 
+ * This call does no blocking I/O.
+ *
  * Returns: (transfer full): a #GFile to a child specified by @name.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFile *
 g_file_get_child (GFile      *file,
-                 const char *name)
+                  const char *name)
 {
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (name != NULL, NULL);
@@ -693,29 +769,30 @@ g_file_get_child (GFile      *file,
 
 /**
  * g_file_get_child_for_display_name:
- * @file: input #GFile.
- * @display_name: string to a possible child.
- * @error: #GError.
- *
- * Gets the child of @file for a given @display_name (i.e. a UTF8
- * version of the name). If this function fails, it returns %NULL and @error will be 
- * set. This is very useful when constructing a GFile for a new file
- * and the user entered the filename in the user interface, for instance
- * when you select a directory and type a filename in the file selector.
- * 
- * This call does no blocking i/o.
- * 
- * Returns: (transfer full): a #GFile to the specified child, or 
- *     %NULL if the display name couldn't be converted.  
+ * @file: input #GFile
+ * @display_name: string to a possible child
+ * @error: return location for an error
+ *
+ * Gets the child of @file for a given @display_name (i.e. a UTF-8
+ * version of the name). If this function fails, it returns %NULL
+ * and @error will be set. This is very useful when constructing a
+ * #GFile for a new file and the user entered the filename in the
+ * user interface, for instance when you select a directory and
+ * type a filename in the file selector.
+ *
+ * This call does no blocking I/O.
+ *
+ * Returns: (transfer full): a #GFile to the specified child, or
+ *     %NULL if the display name couldn't be converted.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFile *
 g_file_get_child_for_display_name (GFile      *file,
-                                  const char *display_name,
-                                  GError **error)
+                                   const char *display_name,
+                                   GError **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (display_name != NULL, NULL);
 
@@ -726,67 +803,74 @@ g_file_get_child_for_display_name (GFile      *file,
 
 /**
  * g_file_has_prefix:
- * @file: input #GFile.
- * @prefix: input #GFile.
- * 
- * Checks whether @file has the prefix specified by @prefix. In other word, 
- * if the names of initial elements of @file<!-- -->s pathname match @prefix.
- * Only full pathname elements are matched, so a path like /foo is not
- * considered a prefix of /foobar, only of /foo/bar.
- * 
- * This call does no i/o, as it works purely on names. As such it can 
- * sometimes return %FALSE even if @file is inside a @prefix (from a 
- * filesystem point of view), because the prefix of @file is an alias 
+ * @file: input #GFile
+ * @prefix: input #GFile
+ *
+ * Checks whether @file has the prefix specified by @prefix.
+ *
+ * In other words, if the names of initial elements of @file's
+ * pathname match @prefix. Only full pathname elements are matched,
+ * so a path like /foo is not considered a prefix of /foobar, only
+ * of /foo/bar.
+ *
+ * A #GFile is not a prefix of itself. If you want to check for
+ * equality, use g_file_equal().
+ *
+ * This call does no I/O, as it works purely on names. As such it can
+ * sometimes return %FALSE even if @file is inside a @prefix (from a
+ * filesystem point of view), because the prefix of @file is an alias
  * of @prefix.
  *
  * Virtual: prefix_matches
- * Returns:  %TRUE if the @files's parent, grandparent, etc is @prefix
+ * Returns:  %TRUE if the @files's parent, grandparent, etc is @prefix,
  *     %FALSE otherwise.
- **/
+ */
 gboolean
 g_file_has_prefix (GFile *file,
-                  GFile *prefix)
+                   GFile *prefix)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (G_IS_FILE (prefix), FALSE);
 
   if (G_TYPE_FROM_INSTANCE (file) != G_TYPE_FROM_INSTANCE (prefix))
     return FALSE;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
-  /* The vtable function differs in arg order since we're
-     using the old contains_file call */
+  /* The vtable function differs in arg order since
+   * we're using the old contains_file call
+   */
   return (* iface->prefix_matches) (prefix, file);
 }
 
 /**
  * g_file_get_relative_path:
- * @parent: input #GFile.
- * @descendant: input #GFile.
+ * @parent: input #GFile
+ * @descendant: input #GFile
  *
- * Gets the path for @descendant relative to @parent. 
+ * Gets the path for @descendant relative to @parent.
  *
- * This call does no blocking i/o.
- * 
- * Returns: string with the relative path from @descendant 
- *     to @parent, or %NULL if @descendant doesn't have @parent as prefix. 
- *     The returned string should be freed with g_free() when no longer needed.
- **/
+ * This call does no blocking I/O.
+ *
+ * Returns: (nullable): string with the relative path from @descendant
+ *     to @parent, or %NULL if @descendant doesn't have @parent as
+ *     prefix. The returned string should be freed with g_free() when
+ *     no longer needed.
+ */
 char *
 g_file_get_relative_path (GFile *parent,
-                         GFile *descendant)
+                          GFile *descendant)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (parent), NULL);
   g_return_val_if_fail (G_IS_FILE (descendant), NULL);
 
   if (G_TYPE_FROM_INSTANCE (parent) != G_TYPE_FROM_INSTANCE (descendant))
     return NULL;
-  
+
   iface = G_FILE_GET_IFACE (parent);
 
   return (* iface->get_relative_path) (parent, descendant);
@@ -794,20 +878,20 @@ g_file_get_relative_path (GFile *parent,
 
 /**
  * g_file_resolve_relative_path:
- * @file: input #GFile.
- * @relative_path: a given relative path string.
+ * @file: input #GFile
+ * @relative_path: a given relative path string
  *
  * Resolves a relative path for @file to an absolute path.
  *
- * This call does no blocking i/o.
- * 
- * Returns: (transfer full): #GFile to the resolved path. %NULL if @relative_path 
- *     is %NULL or if @file is invalid.
+ * This call does no blocking I/O.
+ *
+ * Returns: (transfer full): #GFile to the resolved path.
+ *     %NULL if @relative_path is %NULL or if @file is invalid.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFile *
 g_file_resolve_relative_path (GFile      *file,
-                             const char *relative_path)
+                              const char *relative_path)
 {
   GFileIface *iface;
 
@@ -821,50 +905,54 @@ g_file_resolve_relative_path (GFile      *file,
 
 /**
  * g_file_enumerate_children:
- * @file: input #GFile.
- * @attributes: an attribute query string.
- * @flags: a set of #GFileQueryInfoFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: #GError for error reporting.
- *
- * Gets the requested information about the files in a directory. The result
- * is a #GFileEnumerator object that will give out #GFileInfo objects for
- * all the files in the directory.
- *
- * The @attributes value is a string that specifies the file attributes that
- * should be gathered. It is not an error if it's not possible to read a particular
- * requested attribute from a file - it just won't be set. @attributes should
- * be a comma-separated list of attributes or attribute wildcards. The wildcard "*"
- * means all attributes, and a wildcard like "standard::*" means all attributes in the standard
- * namespace. An example attribute query be "standard::*,owner::user".
- * The standard attributes are available as defines, like #G_FILE_ATTRIBUTE_STANDARD_NAME.
- *
- * If @cancellable is not %NULL, then the operation can be cancelled by
- * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * If the file does not exist, the G_IO_ERROR_NOT_FOUND error will be returned.
- * If the file is not a directory, the G_FILE_ERROR_NOTDIR error will be returned.
- * Other errors are possible too.
- *
- * Returns: (transfer full): A #GFileEnumerator if successful, %NULL on error. 
- *     Free the returned object with g_object_unref().
- **/
+ * @file: input #GFile
+ * @attributes: an attribute query string
+ * @flags: a set of #GFileQueryInfoFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: #GError for error reporting
+ *
+ * Gets the requested information about the files in a directory.
+ * The result is a #GFileEnumerator object that will give out
+ * #GFileInfo objects for all the files in the directory.
+ *
+ * The @attributes value is a string that specifies the file
+ * attributes that should be gathered. It is not an error if
+ * it's not possible to read a particular requested attribute
+ * from a file - it just won't be set. @attributes should
+ * be a comma-separated list of attributes or attribute wildcards.
+ * The wildcard "*" means all attributes, and a wildcard like
+ * "standard::*" means all attributes in the standard namespace.
+ * An example attribute query be "standard::*,owner::user".
+ * The standard attributes are available as defines, like
+ * #G_FILE_ATTRIBUTE_STANDARD_NAME.
+ *
+ * If @cancellable is not %NULL, then the operation can be cancelled
+ * by triggering the cancellable object from another thread. If the
+ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+ * returned.
+ *
+ * If the file does not exist, the %G_IO_ERROR_NOT_FOUND error will
+ * be returned. If the file is not a directory, the %G_IO_ERROR_NOT_DIRECTORY
+ * error will be returned. Other errors are possible too.
+ *
+ * Returns: (transfer full): A #GFileEnumerator if successful,
+ *     %NULL on error. Free the returned object with g_object_unref().
+ */
 GFileEnumerator *
 g_file_enumerate_children (GFile                *file,
-                          const char           *attributes,
-                          GFileQueryInfoFlags   flags,
-                          GCancellable         *cancellable,
-                          GError              **error)
-                          
+                           const char           *attributes,
+                           GFileQueryInfoFlags   flags,
+                           GCancellable         *cancellable,
+                           GError              **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->enumerate_children == NULL)
@@ -876,39 +964,40 @@ g_file_enumerate_children (GFile                *file,
     }
 
   return (* iface->enumerate_children) (file, attributes, flags,
-                                       cancellable, error);
+                                        cancellable, error);
 }
 
 /**
  * g_file_enumerate_children_async:
- * @file: input #GFile.
- * @attributes: an attribute query string.
- * @flags: a set of #GFileQueryInfoFlags.
- * @io_priority: the <link linkend="io-priority">I/O priority</link> 
- *     of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @attributes: an attribute query string
+ * @flags: a set of #GFileQueryInfoFlags
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @callback: (scope async): a #GAsyncReadyCallback to call when the
  *     request is satisfied
  * @user_data: (closure): the data to pass to callback function
  *
- * Asynchronously gets the requested information about the files in a directory. The result
- * is a #GFileEnumerator object that will give out #GFileInfo objects for
- * all the files in the directory.
+ * Asynchronously gets the requested information about the files
+ * in a directory. The result is a #GFileEnumerator object that will
+ * give out #GFileInfo objects for all the files in the directory.
  *
  * For more details, see g_file_enumerate_children() which is
  * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_enumerate_children_finish() to get the result of the operation.
- **/
+ * When the operation is finished, @callback will be called. You can
+ * then call g_file_enumerate_children_finish() to get the result of
+ * the operation.
+ */
 void
 g_file_enumerate_children_async (GFile               *file,
-                                const char          *attributes,
-                                GFileQueryInfoFlags  flags,
-                                int                  io_priority,
-                                GCancellable        *cancellable,
-                                GAsyncReadyCallback  callback,
-                                gpointer             user_data)
+                                 const char          *attributes,
+                                 GFileQueryInfoFlags  flags,
+                                 int                  io_priority,
+                                 GCancellable        *cancellable,
+                                 GAsyncReadyCallback  callback,
+                                 gpointer             user_data)
 {
   GFileIface *iface;
 
@@ -916,51 +1005,49 @@ g_file_enumerate_children_async (GFile               *file,
 
   iface = G_FILE_GET_IFACE (file);
   (* iface->enumerate_children_async) (file,
-                                      attributes,
-                                      flags,
-                                      io_priority,
-                                      cancellable,
-                                      callback,
-                                      user_data);
+                                       attributes,
+                                       flags,
+                                       io_priority,
+                                       cancellable,
+                                       callback,
+                                       user_data);
 }
 
 /**
  * g_file_enumerate_children_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult.
- * @error: a #GError.
- * 
+ * @file: input #GFile
+ * @res: a #GAsyncResult
+ * @error: a #GError
+ *
  * Finishes an async enumerate children operation.
  * See g_file_enumerate_children_async().
  *
- * Returns: (transfer full): a #GFileEnumerator or %NULL if an error occurred.
+ * Returns: (transfer full): a #GFileEnumerator or %NULL
+ *     if an error occurred.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileEnumerator *
 g_file_enumerate_children_finish (GFile         *file,
-                                 GAsyncResult  *res,
-                                 GError       **error)
+                                  GAsyncResult  *res,
+                                  GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return NULL;
-    }
-  
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->enumerate_children_finish) (file, res, error);
 }
 
 /**
  * g_file_query_exists:
- * @file: input #GFile.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  *
  * Utility function to check if a particular file exists. This is
  * implemented using g_file_query_info() and as such does blocking I/O.
@@ -971,69 +1058,71 @@ g_file_enumerate_children_finish (GFile         *file,
  * general approach to handling that is to not check, but just do the
  * operation and handle the errors as they come.
  *
- * As an example of race-free checking, take the case of reading a file, and
- * if it doesn't exist, creating it. There are two racy versions: read it, and
- * on error create it; and: check if it exists, if not create it. These
- * can both result in two processes creating the file (with perhaps a partially
- * written file as the result). The correct approach is to always try to create
- * the file with g_file_create() which will either atomically create the file
- * or fail with a G_IO_ERROR_EXISTS error.
- *
- * However, in many cases an existence check is useful in a user
- * interface, for instance to make a menu item sensitive/insensitive, so that
- * you don't have to fool users that something is possible and then just show
- * and error dialog. If you do this, you should make sure to also handle the
- * errors that can happen due to races when you execute the operation.
- * 
- * Returns: %TRUE if the file exists (and can be detected without error), %FALSE otherwise (or if cancelled).
+ * As an example of race-free checking, take the case of reading a file,
+ * and if it doesn't exist, creating it. There are two racy versions: read
+ * it, and on error create it; and: check if it exists, if not create it.
+ * These can both result in two processes creating the file (with perhaps
+ * a partially written file as the result). The correct approach is to
+ * always try to create the file with g_file_create() which will either
+ * atomically create the file or fail with a %G_IO_ERROR_EXISTS error.
+ *
+ * However, in many cases an existence check is useful in a user interface,
+ * for instance to make a menu item sensitive/insensitive, so that you don't
+ * have to fool users that something is possible and then just show an error
+ * dialog. If you do this, you should make sure to also handle the errors
+ * that can happen due to races when you execute the operation.
+ *
+ * Returns: %TRUE if the file exists (and can be detected without error),
+ *     %FALSE otherwise (or if cancelled).
  */
 gboolean
-g_file_query_exists (GFile *file,
-                    GCancellable *cancellable)
+g_file_query_exists (GFile        *file,
+                     GCancellable *cancellable)
 {
   GFileInfo *info;
-  
+
   g_return_val_if_fail (G_IS_FILE(file), FALSE);
-  
+
   info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TYPE,
-                           G_FILE_QUERY_INFO_NONE, cancellable, NULL);
+                            G_FILE_QUERY_INFO_NONE, cancellable, NULL);
   if (info != NULL)
     {
       g_object_unref (info);
       return TRUE;
     }
-  
+
   return FALSE;
 }
 
 /**
  * g_file_query_file_type:
- * @file: input #GFile.
- * @flags: a set of #GFileQueryInfoFlags passed to g_file_query_info().
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @flags: a set of #GFileQueryInfoFlags passed to g_file_query_info()
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  *
  * Utility function to inspect the #GFileType of a file. This is
  * implemented using g_file_query_info() and as such does blocking I/O.
  *
- * The primary use case of this method is to check if a file is a regular file,
- * directory, or symlink.
- * 
- * Returns: The #GFileType of the file and #G_FILE_TYPE_UNKNOWN if the file
- *          does not exist
+ * The primary use case of this method is to check if a file is
+ * a regular file, directory, or symlink.
+ *
+ * Returns: The #GFileType of the file and #G_FILE_TYPE_UNKNOWN
+ *     if the file does not exist
  *
  * Since: 2.18
  */
 GFileType
-g_file_query_file_type (GFile *file,
-                        GFileQueryInfoFlags   flags,
-                       GCancellable *cancellable)
+g_file_query_file_type (GFile               *file,
+                        GFileQueryInfoFlags  flags,
+                        GCancellable        *cancellable)
 {
   GFileInfo *info;
   GFileType file_type;
-  
+
   g_return_val_if_fail (G_IS_FILE(file), G_FILE_TYPE_UNKNOWN);
   info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TYPE, flags,
-                           cancellable, NULL);
+                            cancellable, NULL);
   if (info != NULL)
     {
       file_type = g_file_info_get_file_type (info);
@@ -1041,61 +1130,67 @@ g_file_query_file_type (GFile *file,
     }
   else
     file_type = G_FILE_TYPE_UNKNOWN;
-  
+
   return file_type;
 }
 
 /**
  * g_file_query_info:
- * @file: input #GFile.
- * @attributes: an attribute query string.
- * @flags: a set of #GFileQueryInfoFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: a #GError.
- *
- * Gets the requested information about specified @file. The result
- * is a #GFileInfo object that contains key-value attributes (such as 
- * the type or size of the file).
- *
- * The @attributes value is a string that specifies the file attributes that
- * should be gathered. It is not an error if it's not possible to read a particular
- * requested attribute from a file - it just won't be set. @attributes should
- * be a comma-separated list of attributes or attribute wildcards. The wildcard "*"
- * means all attributes, and a wildcard like "standard::*" means all attributes in the standard
- * namespace. An example attribute query be "standard::*,owner::user".
- * The standard attributes are available as defines, like #G_FILE_ATTRIBUTE_STANDARD_NAME.
- * 
- * If @cancellable is not %NULL, then the operation can be cancelled by
- * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
+ * @file: input #GFile
+ * @attributes: an attribute query string
+ * @flags: a set of #GFileQueryInfoFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError
+ *
+ * Gets the requested information about specified @file.
+ * The result is a #GFileInfo object that contains key-value
+ * attributes (such as the type or size of the file).
+ *
+ * The @attributes value is a string that specifies the file
+ * attributes that should be gathered. It is not an error if
+ * it's not possible to read a particular requested attribute
+ * from a file - it just won't be set. @attributes should be a
+ * comma-separated list of attributes or attribute wildcards.
+ * The wildcard "*" means all attributes, and a wildcard like
+ * "standard::*" means all attributes in the standard namespace.
+ * An example attribute query be "standard::*,owner::user".
+ * The standard attributes are available as defines, like
+ * #G_FILE_ATTRIBUTE_STANDARD_NAME.
+ *
+ * If @cancellable is not %NULL, then the operation can be cancelled
+ * by triggering the cancellable object from another thread. If the
+ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+ * returned.
  *
  * For symlinks, normally the information about the target of the
- * symlink is returned, rather than information about the symlink itself.
- * However if you pass #G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS in @flags the
- * information about the symlink itself will be returned. Also, for symlinks
- * that point to non-existing files the information about the symlink itself
- * will be returned.
+ * symlink is returned, rather than information about the symlink
+ * itself. However if you pass #G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS
+ * in @flags the information about the symlink itself will be returned.
+ * Also, for symlinks that point to non-existing files the information
+ * about the symlink itself will be returned.
  *
- * If the file does not exist, the G_IO_ERROR_NOT_FOUND error will be returned.
- * Other errors are possible too, and depend on what kind of filesystem the file is on.
+ * If the file does not exist, the %G_IO_ERROR_NOT_FOUND error will be
+ * returned. Other errors are possible too, and depend on what kind of
+ * filesystem the file is on.
  *
- * Returns: (transfer full): a #GFileInfo for the given @file, or %NULL on error.
- *     Free the returned object with g_object_unref().
- **/
+ * Returns: (transfer full): a #GFileInfo for the given @file, or %NULL
+ *     on error. Free the returned object with g_object_unref().
+ */
 GFileInfo *
 g_file_query_info (GFile                *file,
-                  const char           *attributes,
-                  GFileQueryInfoFlags   flags,
-                  GCancellable         *cancellable,
-                  GError              **error)
+                   const char           *attributes,
+                   GFileQueryInfoFlags   flags,
+                   GCancellable         *cancellable,
+                   GError              **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->query_info == NULL)
@@ -1105,132 +1200,135 @@ g_file_query_info (GFile                *file,
                            _("Operation not supported"));
       return NULL;
     }
-  
+
   return (* iface->query_info) (file, attributes, flags, cancellable, error);
 }
 
 /**
  * g_file_query_info_async:
- * @file: input #GFile.
- * @attributes: an attribute query string.
- * @flags: a set of #GFileQueryInfoFlags.
- * @io_priority: the <link linkend="io-priority">I/O priority</link> 
- *     of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. 
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @file: input #GFile
+ * @attributes: an attribute query string
+ * @flags: a set of #GFileQueryInfoFlags
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call when the
+ *     request is satisfied
  * @user_data: (closure): the data to pass to callback function
- * 
- * Asynchronously gets the requested information about specified @file. The result
- * is a #GFileInfo object that contains key-value attributes (such as type or size
- * for the file).
- * 
- * For more details, see g_file_query_info() which is
- * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_query_info_finish() to get the result of the operation.
- **/
+ * Asynchronously gets the requested information about specified @file.
+ * The result is a #GFileInfo object that contains key-value attributes
+ * (such as type or size for the file).
+ *
+ * For more details, see g_file_query_info() which is the synchronous
+ * version of this call.
+ *
+ * When the operation is finished, @callback will be called. You can
+ * then call g_file_query_info_finish() to get the result of the operation.
+ */
 void
 g_file_query_info_async (GFile               *file,
-                        const char          *attributes,
-                        GFileQueryInfoFlags  flags,
-                        int                  io_priority,
-                        GCancellable        *cancellable,
-                        GAsyncReadyCallback  callback,
-                        gpointer             user_data)
+                         const char          *attributes,
+                         GFileQueryInfoFlags  flags,
+                         int                  io_priority,
+                         GCancellable        *cancellable,
+                         GAsyncReadyCallback  callback,
+                         gpointer             user_data)
 {
   GFileIface *iface;
-  
+
   g_return_if_fail (G_IS_FILE (file));
 
   iface = G_FILE_GET_IFACE (file);
   (* iface->query_info_async) (file,
-                              attributes,
-                              flags,
-                              io_priority,
-                              cancellable,
-                              callback,
-                              user_data);
+                               attributes,
+                               flags,
+                               io_priority,
+                               cancellable,
+                               callback,
+                               user_data);
 }
 
 /**
  * g_file_query_info_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult
- * @error: a #GError
- * 
- * Finishes an asynchronous file info query. 
+ * @file: input #GFile
+ * @res: a #GAsyncResult
+ * @error: a #GError
+ *
+ * Finishes an asynchronous file info query.
  * See g_file_query_info_async().
- * 
- * Returns: (transfer full): #GFileInfo for given @file or %NULL on error.
- *     Free the returned object with g_object_unref().
- **/
+ *
+ * Returns: (transfer full): #GFileInfo for given @file
+ *     or %NULL on error. Free the returned object with
+ *     g_object_unref().
+ */
 GFileInfo *
 g_file_query_info_finish (GFile         *file,
-                         GAsyncResult  *res,
-                         GError       **error)
+                          GAsyncResult  *res,
+                          GError       **error)
 {
   GFileIface *iface;
 
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return NULL;
-    }
-  
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->query_info_finish) (file, res, error);
 }
 
 /**
  * g_file_query_filesystem_info:
- * @file: input #GFile.
- * @attributes:  an attribute query string.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. 
- * @error: a #GError. 
- * 
+ * @file: input #GFile
+ * @attributes:  an attribute query string
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError
+ *
  * Similar to g_file_query_info(), but obtains information
  * about the filesystem the @file is on, rather than the file itself.
  * For instance the amount of space available and the type of
  * the filesystem.
  *
- * The @attributes value is a string that specifies the file attributes that
- * should be gathered. It is not an error if it's not possible to read a particular
- * requested attribute from a file - it just won't be set. @attributes should
- * be a comma-separated list of attributes or attribute wildcards. The wildcard "*"
- * means all attributes, and a wildcard like "filesystem::*" means all attributes in the
- * filesystem namespace. The standard namespace for filesystem attributes is "filesystem".
- * Common attributes of interest are #G_FILE_ATTRIBUTE_FILESYSTEM_SIZE
- * (the total size of the filesystem in bytes), #G_FILE_ATTRIBUTE_FILESYSTEM_FREE (number of
- * bytes available), and #G_FILE_ATTRIBUTE_FILESYSTEM_TYPE (type of the filesystem).
- * 
- * If @cancellable is not %NULL, then the operation can be cancelled by
- * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- *
- * If the file does not exist, the G_IO_ERROR_NOT_FOUND error will be returned.
- * Other errors are possible too, and depend on what kind of filesystem the file is on.
+ * The @attributes value is a string that specifies the attributes
+ * that should be gathered. It is not an error if it's not possible
+ * to read a particular requested attribute from a file - it just
+ * won't be set. @attributes should be a comma-separated list of
+ * attributes or attribute wildcards. The wildcard "*" means all
+ * attributes, and a wildcard like "filesystem::*" means all attributes
+ * in the filesystem namespace. The standard namespace for filesystem
+ * attributes is "filesystem". Common attributes of interest are
+ * #G_FILE_ATTRIBUTE_FILESYSTEM_SIZE (the total size of the filesystem
+ * in bytes), #G_FILE_ATTRIBUTE_FILESYSTEM_FREE (number of bytes available),
+ * and #G_FILE_ATTRIBUTE_FILESYSTEM_TYPE (type of the filesystem).
+ *
+ * If @cancellable is not %NULL, then the operation can be cancelled
+ * by triggering the cancellable object from another thread. If the
+ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+ * returned.
+ *
+ * If the file does not exist, the %G_IO_ERROR_NOT_FOUND error will
+ * be returned. Other errors are possible too, and depend on what
+ * kind of filesystem the file is on.
  *
  * Returns: (transfer full): a #GFileInfo or %NULL if there was an error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileInfo *
 g_file_query_filesystem_info (GFile         *file,
-                             const char    *attributes,
-                             GCancellable  *cancellable,
-                             GError       **error)
+                              const char    *attributes,
+                              GCancellable  *cancellable,
+                              GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->query_filesystem_info == NULL)
@@ -1240,32 +1338,33 @@ g_file_query_filesystem_info (GFile         *file,
                            _("Operation not supported"));
       return NULL;
     }
-  
+
   return (* iface->query_filesystem_info) (file, attributes, cancellable, error);
 }
 
 /**
  * g_file_query_filesystem_info_async:
- * @file: input #GFile.
- * @attributes: an attribute query string.
- * @io_priority: the <link linkend="io-priority">I/O priority</link> 
- *     of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. 
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @file: input #GFile
+ * @attributes: an attribute query string
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call
+ *     when the request is satisfied
  * @user_data: (closure): the data to pass to callback function
- * 
+ *
  * Asynchronously gets the requested information about the filesystem
  * that the specified @file is on. The result is a #GFileInfo object
  * that contains key-value attributes (such as type or size for the
  * file).
- * 
+ *
  * For more details, see g_file_query_filesystem_info() which is the
  * synchronous version of this call.
  *
  * When the operation is finished, @callback will be called. You can
  * then call g_file_query_info_finish() to get the result of the
  * operation.
- **/
+ */
 void
 g_file_query_filesystem_info_async (GFile               *file,
                                     const char          *attributes,
@@ -1275,7 +1374,7 @@ g_file_query_filesystem_info_async (GFile               *file,
                                     gpointer             user_data)
 {
   GFileIface *iface;
-  
+
   g_return_if_fail (G_IS_FILE (file));
 
   iface = G_FILE_GET_IFACE (file);
@@ -1289,16 +1388,17 @@ g_file_query_filesystem_info_async (GFile               *file,
 
 /**
  * g_file_query_filesystem_info_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult. 
- * @error: a #GError. 
- * 
- * Finishes an asynchronous filesystem info query.  See
- * g_file_query_filesystem_info_async().
- * 
- * Returns: (transfer full): #GFileInfo for given @file or %NULL on error.
+ * @file: input #GFile
+ * @res: a #GAsyncResult
+ * @error: a #GError
+ *
+ * Finishes an asynchronous filesystem info query.
+ * See g_file_query_filesystem_info_async().
+ *
+ * Returns: (transfer full): #GFileInfo for given @file
+ *     or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileInfo *
 g_file_query_filesystem_info_finish (GFile         *file,
                                      GAsyncResult  *res,
@@ -1309,40 +1409,38 @@ g_file_query_filesystem_info_finish (GFile         *file,
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return NULL;
-    }
-  
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->query_filesystem_info_finish) (file, res, error);
 }
 
 /**
  * g_file_find_enclosing_mount:
- * @file: input #GFile.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. 
- * @error: a #GError. 
+ * @file: input #GFile
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError
  *
- * Gets a #GMount for the #GFile. 
+ * Gets a #GMount for the #GFile.
+ *
+ * If the #GFileIface for @file does not have a mount (e.g.
+ * possibly a remote share), @error will be set to %G_IO_ERROR_NOT_FOUND
+ * and %NULL will be returned.
  *
- * If the #GFileIface for @file does not have a mount (e.g. possibly a 
- * remote share), @error will be set to %G_IO_ERROR_NOT_FOUND and %NULL
- * will be returned.
- * 
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * Returns: (transfer full): a #GMount where the @file is located or %NULL on error.
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * Returns: (transfer full): a #GMount where the @file is located
+ *     or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GMount *
 g_file_find_enclosing_mount (GFile         *file,
-                            GCancellable  *cancellable,
-                            GError       **error)
+                             GCancellable  *cancellable,
+                             GError       **error)
 {
   GFileIface *iface;
 
@@ -1356,9 +1454,11 @@ g_file_find_enclosing_mount (GFile         *file,
     {
 
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
-                       /* Translators: This is an error message when trying to find the
-                        * enclosing (user visible) mount of a file, but none exists. */
-                  _("Containing mount does not exist"));
+                           /* Translators: This is an error message when
+                            * trying to find the enclosing (user visible)
+                            * mount of a file, but none exists.
+                            */
+                           _("Containing mount does not exist"));
       return NULL;
     }
 
@@ -1368,10 +1468,11 @@ g_file_find_enclosing_mount (GFile         *file,
 /**
  * g_file_find_enclosing_mount_async:
  * @file: a #GFile
- * @io_priority: the <link linkend="io-priority">I/O priority</link> 
- *     of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call
+ *     when the request is satisfied
  * @user_data: (closure): the data to pass to callback function
  *
  * Asynchronously gets the mount for the file.
@@ -1379,15 +1480,16 @@ g_file_find_enclosing_mount (GFile         *file,
  * For more details, see g_file_find_enclosing_mount() which is
  * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_find_enclosing_mount_finish() to get the result of the operation.
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_find_enclosing_mount_finish() to
+ * get the result of the operation.
  */
 void
 g_file_find_enclosing_mount_async (GFile              *file,
-                                  int                   io_priority,
-                                  GCancellable         *cancellable,
-                                  GAsyncReadyCallback   callback,
-                                  gpointer              user_data)
+                                   int                   io_priority,
+                                   GCancellable         *cancellable,
+                                   GAsyncReadyCallback   callback,
+                                   gpointer              user_data)
 {
   GFileIface *iface;
 
@@ -1395,10 +1497,10 @@ g_file_find_enclosing_mount_async (GFile              *file,
 
   iface = G_FILE_GET_IFACE (file);
   (* iface->find_enclosing_mount_async) (file,
-                                        io_priority,
-                                        cancellable,
-                                        callback,
-                                        user_data);
+                                         io_priority,
+                                         cancellable,
+                                         callback,
+                                         user_data);
 }
 
 /**
@@ -1406,30 +1508,26 @@ g_file_find_enclosing_mount_async (GFile              *file,
  * @file: a #GFile
  * @res: a #GAsyncResult
  * @error: a #GError
- * 
- * Finishes an asynchronous find mount request. 
+ *
+ * Finishes an asynchronous find mount request.
  * See g_file_find_enclosing_mount_async().
- * 
+ *
  * Returns: (transfer full): #GMount for given @file or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GMount *
 g_file_find_enclosing_mount_finish (GFile         *file,
-                                   GAsyncResult  *res,
-                                   GError       **error)
+                                    GAsyncResult  *res,
+                                    GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return NULL;
-    }
-  
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->find_enclosing_mount_finish) (file, res, error);
 }
@@ -1437,7 +1535,7 @@ g_file_find_enclosing_mount_finish (GFile         *file,
 
 /**
  * g_file_read:
- * @file: #GFile to read.
+ * @file: #GFile to read
  * @cancellable: (allow-none): a #GCancellable
  * @error: a #GError, or %NULL
  *
@@ -1446,23 +1544,24 @@ g_file_find_enclosing_mount_finish (GFile         *file,
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * If the file does not exist, the G_IO_ERROR_NOT_FOUND error will be returned.
- * If the file is a directory, the G_IO_ERROR_IS_DIRECTORY error will be returned.
- * Other errors are possible too, and depend on what kind of filesystem the file is on.
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * If the file does not exist, the %G_IO_ERROR_NOT_FOUND error will be
+ * returned. If the file is a directory, the %G_IO_ERROR_IS_DIRECTORY
+ * error will be returned. Other errors are possible too, and depend
+ * on what kind of filesystem the file is on.
  *
  * Virtual: read_fn
  * Returns: (transfer full): #GFileInputStream or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileInputStream *
 g_file_read (GFile         *file,
-            GCancellable  *cancellable,
-            GError       **error)
+             GCancellable  *cancellable,
+             GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
@@ -1477,43 +1576,44 @@ g_file_read (GFile         *file,
                            _("Operation not supported"));
       return NULL;
     }
-  
+
   return (* iface->read_fn) (file, cancellable, error);
 }
 
 /**
  * g_file_append_to:
- * @file: input #GFile.
- * @flags: a set of #GFileCreateFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @flags: a set of #GFileCreateFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
  *
- * Gets an output stream for appending data to the file. If
- * the file doesn't already exist it is created.
+ * Gets an output stream for appending data to the file.
+ * If the file doesn't already exist it is created.
  *
  * By default files created are generally readable by everyone,
  * but if you pass #G_FILE_CREATE_PRIVATE in @flags the file
  * will be made readable only to the current user, to the level that
  * is supported on the target filesystem.
  *
- * If @cancellable is not %NULL, then the operation can be cancelled by
- * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
+ * If @cancellable is not %NULL, then the operation can be cancelled
+ * by triggering the cancellable object from another thread. If the
+ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+ * returned.
+ *
+ * Some file systems don't allow all file names, and may return an
+ * %G_IO_ERROR_INVALID_FILENAME error. If the file is a directory the
+ * %G_IO_ERROR_IS_DIRECTORY error will be returned. Other errors are
+ * possible too, and depend on what kind of filesystem the file is on.
  *
- * Some file systems don't allow all file names, and may
- * return an %G_IO_ERROR_INVALID_FILENAME error.
- * If the file is a directory the %G_IO_ERROR_IS_DIRECTORY error will be
- * returned. Other errors are possible too, and depend on what kind of
- * filesystem the file is on.
- * 
  * Returns: (transfer full): a #GFileOutputStream, or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileOutputStream *
 g_file_append_to (GFile             *file,
-                 GFileCreateFlags   flags,
-                 GCancellable      *cancellable,
-                 GError           **error)
+                  GFileCreateFlags   flags,
+                  GCancellable      *cancellable,
+                  GError           **error)
 {
   GFileIface *iface;
 
@@ -1521,7 +1621,7 @@ g_file_append_to (GFile             *file,
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->append_to == NULL)
@@ -1531,15 +1631,16 @@ g_file_append_to (GFile             *file,
                            _("Operation not supported"));
       return NULL;
     }
-  
+
   return (* iface->append_to) (file, flags, cancellable, error);
 }
 
 /**
  * g_file_create:
- * @file: input #GFile.
- * @flags: a set of #GFileCreateFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @flags: a set of #GFileCreateFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
  *
  * Creates a new file and returns an output stream for writing to it.
@@ -1547,38 +1648,38 @@ g_file_append_to (GFile             *file,
  *
  * By default files created are generally readable by everyone,
  * but if you pass #G_FILE_CREATE_PRIVATE in @flags the file
- * will be made readable only to the current user, to the level that
- * is supported on the target filesystem.
- *
- * If @cancellable is not %NULL, then the operation can be cancelled by
- * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- *
- * If a file or directory with this name already exists the G_IO_ERROR_EXISTS
- * error will be returned.
- * Some file systems don't allow all file names, and may
- * return an G_IO_ERROR_INVALID_FILENAME error, and if the name
- * is to long G_IO_ERROR_FILENAME_TOO_LONG will be returned.
- * Other errors are possible too, and depend on what kind of
- * filesystem the file is on.
- * 
- * Returns: (transfer full): a #GFileOutputStream for the newly created file, or 
- *     %NULL on error.
+ * will be made readable only to the current user, to the level
+ * that is supported on the target filesystem.
+ *
+ * If @cancellable is not %NULL, then the operation can be cancelled
+ * by triggering the cancellable object from another thread. If the
+ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+ * returned.
+ *
+ * If a file or directory with this name already exists the
+ * %G_IO_ERROR_EXISTS error will be returned. Some file systems don't
+ * allow all file names, and may return an %G_IO_ERROR_INVALID_FILENAME
+ * error, and if the name is to long %G_IO_ERROR_FILENAME_TOO_LONG will
+ * be returned. Other errors are possible too, and depend on what kind
+ * of filesystem the file is on.
+ *
+ * Returns: (transfer full): a #GFileOutputStream for the newly created
+ *     file, or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileOutputStream *
 g_file_create (GFile             *file,
-              GFileCreateFlags   flags,
-              GCancellable      *cancellable,
-              GError           **error)
+               GFileCreateFlags   flags,
+               GCancellable      *cancellable,
+               GError           **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->create == NULL)
@@ -1588,18 +1689,19 @@ g_file_create (GFile             *file,
                            _("Operation not supported"));
       return NULL;
     }
-  
+
   return (* iface->create) (file, flags, cancellable, error);
 }
 
 /**
  * g_file_replace:
- * @file: input #GFile.
- * @etag: (allow-none): an optional <link linkend="gfile-etag">entity tag</link> for the 
- *     current #GFile, or #NULL to ignore.
- * @make_backup: %TRUE if a backup should be created.
- * @flags: a set of #GFileCreateFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @etag: (allow-none): an optional [entity tag][gfile-etag]
+ *     for the current #GFile, or #NULL to ignore
+ * @make_backup: %TRUE if a backup should be created
+ * @flags: a set of #GFileCreateFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
  *
  * Returns an output stream for overwriting the file, possibly
@@ -1611,49 +1713,49 @@ g_file_create (GFile             *file,
  * existing copy of the file. For instance, for local files it
  * may write to a temporary file and then atomically rename over
  * the destination when the stream is closed.
- * 
+ *
  * By default files created are generally readable by everyone,
  * but if you pass #G_FILE_CREATE_PRIVATE in @flags the file
  * will be made readable only to the current user, to the level that
  * is supported on the target filesystem.
  *
- * If @cancellable is not %NULL, then the operation can be cancelled by
- * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * If you pass in a non-#NULL @etag value, then this value is
- * compared to the current entity tag of the file, and if they differ
- * an G_IO_ERROR_WRONG_ETAG error is returned. This generally means
- * that the file has been changed since you last read it. You can get
- * the new etag from g_file_output_stream_get_etag() after you've
- * finished writing and closed the #GFileOutputStream. When you load
- * a new file you can use g_file_input_stream_query_info() to get
- * the etag of the file.
- * 
- * If @make_backup is %TRUE, this function will attempt to make a backup
- * of the current file before overwriting it. If this fails a G_IO_ERROR_CANT_CREATE_BACKUP
- * error will be returned. If you want to replace anyway, try again with
- * @make_backup set to %FALSE.
- *
- * If the file is a directory the G_IO_ERROR_IS_DIRECTORY error will be returned,
- * and if the file is some other form of non-regular file then a
- * G_IO_ERROR_NOT_REGULAR_FILE error will be returned.
- * Some file systems don't allow all file names, and may
- * return an G_IO_ERROR_INVALID_FILENAME error, and if the name
- * is to long G_IO_ERROR_FILENAME_TOO_LONG will be returned.
- * Other errors are possible too, and depend on what kind of
- * filesystem the file is on.
+ * If @cancellable is not %NULL, then the operation can be cancelled
+ * by triggering the cancellable object from another thread. If the
+ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+ * returned.
+ *
+ * If you pass in a non-%NULL @etag value and @file already exists, then
+ * this value is compared to the current entity tag of the file, and if
+ * they differ an %G_IO_ERROR_WRONG_ETAG error is returned. This
+ * generally means that the file has been changed since you last read
+ * it. You can get the new etag from g_file_output_stream_get_etag()
+ * after you've finished writing and closed the #GFileOutputStream. When
+ * you load a new file you can use g_file_input_stream_query_info() to
+ * get the etag of the file.
+ *
+ * If @make_backup is %TRUE, this function will attempt to make a
+ * backup of the current file before overwriting it. If this fails
+ * a %G_IO_ERROR_CANT_CREATE_BACKUP error will be returned. If you
+ * want to replace anyway, try again with @make_backup set to %FALSE.
+ *
+ * If the file is a directory the %G_IO_ERROR_IS_DIRECTORY error will
+ * be returned, and if the file is some other form of non-regular file
+ * then a %G_IO_ERROR_NOT_REGULAR_FILE error will be returned. Some
+ * file systems don't allow all file names, and may return an
+ * %G_IO_ERROR_INVALID_FILENAME error, and if the name is to long
+ * %G_IO_ERROR_FILENAME_TOO_LONG will be returned. Other errors are
+ * possible too, and depend on what kind of filesystem the file is on.
  *
- * Returns: (transfer full): a #GFileOutputStream or %NULL on error. 
+ * Returns: (transfer full): a #GFileOutputStream or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileOutputStream *
 g_file_replace (GFile             *file,
-               const char        *etag,
-               gboolean           make_backup,
-               GFileCreateFlags   flags,
-               GCancellable      *cancellable,
-               GError           **error)
+                const char        *etag,
+                gboolean           make_backup,
+                GFileCreateFlags   flags,
+                GCancellable      *cancellable,
+                GError           **error)
 {
   GFileIface *iface;
 
@@ -1661,7 +1763,7 @@ g_file_replace (GFile             *file,
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->replace == NULL)
@@ -1671,12 +1773,11 @@ g_file_replace (GFile             *file,
                            _("Operation not supported"));
       return NULL;
     }
-  
-  
+
   /* Handle empty tag string as NULL in consistent way. */
   if (etag && *etag == 0)
     etag = NULL;
-  
+
   return (* iface->replace) (file, etag, make_backup, flags, cancellable, error);
 }
 
@@ -1687,28 +1788,31 @@ g_file_replace (GFile             *file,
  * @error: a #GError, or %NULL
  *
  * Opens an existing file for reading and writing. The result is
- * a #GFileIOStream that can be used to read and write the contents of the file.
- *
- * If @cancellable is not %NULL, then the operation can be cancelled by
- * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
- *
- * If the file does not exist, the G_IO_ERROR_NOT_FOUND error will be returned.
- * If the file is a directory, the G_IO_ERROR_IS_DIRECTORY error will be returned.
- * Other errors are possible too, and depend on what kind of filesystem the file is on.
- * Note that in many non-local file cases read and write streams are not supported,
- * so make sure you really need to do read and write streaming, rather than
- * just opening for reading or writing.
+ * a #GFileIOStream that can be used to read and write the contents
+ * of the file.
+ *
+ * If @cancellable is not %NULL, then the operation can be cancelled
+ * by triggering the cancellable object from another thread. If the
+ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+ * returned.
+ *
+ * If the file does not exist, the %G_IO_ERROR_NOT_FOUND error will
+ * be returned. If the file is a directory, the %G_IO_ERROR_IS_DIRECTORY
+ * error will be returned. Other errors are possible too, and depend on
+ * what kind of filesystem the file is on. Note that in many non-local
+ * file cases read and write streams are not supported, so make sure you
+ * really need to do read and write streaming, rather than just opening
+ * for reading or writing.
  *
  * Returns: (transfer full): #GFileIOStream or %NULL on error.
  *     Free the returned object with g_object_unref().
  *
  * Since: 2.22
- **/
+ */
 GFileIOStream *
-g_file_open_readwrite (GFile                      *file,
-                       GCancellable               *cancellable,
-                       GError                    **error)
+g_file_open_readwrite (GFile         *file,
+                       GCancellable  *cancellable,
+                       GError       **error)
 {
   GFileIface *iface;
 
@@ -1734,32 +1838,36 @@ g_file_open_readwrite (GFile                      *file,
  * g_file_create_readwrite:
  * @file: a #GFile
  * @flags: a set of #GFileCreateFlags
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: return location for a #GError, or %NULL
  *
- * Creates a new file and returns a stream for reading and writing to it.
- * The file must not already exist.
+ * Creates a new file and returns a stream for reading and
+ * writing to it. The file must not already exist.
  *
  * By default files created are generally readable by everyone,
  * but if you pass #G_FILE_CREATE_PRIVATE in @flags the file
- * will be made readable only to the current user, to the level that
- * is supported on the target filesystem.
- *
- * If @cancellable is not %NULL, then the operation can be cancelled by
- * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
- *
- * If a file or directory with this name already exists the %G_IO_ERROR_EXISTS
- * error will be returned. Some file systems don't allow all file names,
- * and may return an %G_IO_ERROR_INVALID_FILENAME error, and if the name
- * is too long, %G_IO_ERROR_FILENAME_TOO_LONG will be returned. Other errors
- * are possible too, and depend on what kind of filesystem the file is on.
- *
- * Note that in many non-local file cases read and write streams are not
- * supported, so make sure you really need to do read and write streaming,
- * rather than just opening for reading or writing.
- *
- * Returns: (transfer full): a #GFileIOStream for the newly created file, or %NULL on error.
+ * will be made readable only to the current user, to the level
+ * that is supported on the target filesystem.
+ *
+ * If @cancellable is not %NULL, then the operation can be cancelled
+ * by triggering the cancellable object from another thread. If the
+ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+ * returned.
+ *
+ * If a file or directory with this name already exists, the
+ * %G_IO_ERROR_EXISTS error will be returned. Some file systems don't
+ * allow all file names, and may return an %G_IO_ERROR_INVALID_FILENAME
+ * error, and if the name is too long, %G_IO_ERROR_FILENAME_TOO_LONG
+ * will be returned. Other errors are possible too, and depend on what
+ * kind of filesystem the file is on.
+ *
+ * Note that in many non-local file cases read and write streams are
+ * not supported, so make sure you really need to do read and write
+ * streaming, rather than just opening for reading or writing.
+ *
+ * Returns: (transfer full): a #GFileIOStream for the newly created
+ *     file, or %NULL on error.
  *     Free the returned object with g_object_unref().
  *
  * Since: 2.22
@@ -1793,19 +1901,20 @@ g_file_create_readwrite (GFile             *file,
 /**
  * g_file_replace_readwrite:
  * @file: a #GFile
- * @etag: (allow-none): an optional <link linkend="gfile-etag">entity tag</link> for the
- *     current #GFile, or #NULL to ignore
+ * @etag: (allow-none): an optional [entity tag][gfile-etag]
+ *     for the current #GFile, or #NULL to ignore
  * @make_backup: %TRUE if a backup should be created
  * @flags: a set of #GFileCreateFlags
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: return location for a #GError, or %NULL
  *
  * Returns an output stream for overwriting the file in readwrite mode,
  * possibly creating a backup copy of the file first. If the file doesn't
  * exist, it will be created.
  *
- * For details about the behaviour, see g_file_replace() which does the same
- * thing but returns an output stream only.
+ * For details about the behaviour, see g_file_replace() which does the
+ * same thing but returns an output stream only.
  *
  * Note that in many non-local file cases read and write streams are not
  * supported, so make sure you really need to do read and write streaming,
@@ -1847,10 +1956,11 @@ g_file_replace_readwrite (GFile             *file,
 /**
  * g_file_read_async:
  * @file: input #GFile
- * @io_priority: the <link linkend="io-priority">I/O priority</link>
- *     of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call
+ *     when the request is satisfied
  * @user_data: (closure): the data to pass to callback function
  *
  * Asynchronously opens @file for reading.
@@ -1858,294 +1968,286 @@ g_file_replace_readwrite (GFile             *file,
  * For more details, see g_file_read() which is
  * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_read_finish() to get the result of the operation.
- **/
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_read_finish() to get the result
+ * of the operation.
+ */
 void
 g_file_read_async (GFile               *file,
-                  int                  io_priority,
-                  GCancellable        *cancellable,
-                  GAsyncReadyCallback  callback,
-                  gpointer             user_data)
+                   int                  io_priority,
+                   GCancellable        *cancellable,
+                   GAsyncReadyCallback  callback,
+                   gpointer             user_data)
 {
   GFileIface *iface;
-  
+
   g_return_if_fail (G_IS_FILE (file));
 
   iface = G_FILE_GET_IFACE (file);
   (* iface->read_async) (file,
-                        io_priority,
-                        cancellable,
-                        callback,
-                        user_data);
+                         io_priority,
+                         cancellable,
+                         callback,
+                         user_data);
 }
 
 /**
  * g_file_read_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult
+ * @file: input #GFile
+ * @res: a #GAsyncResult
  * @error: a #GError, or %NULL
  *
- * Finishes an asynchronous file read operation started with 
- * g_file_read_async(). 
- *  
+ * Finishes an asynchronous file read operation started with
+ * g_file_read_async().
+ *
  * Returns: (transfer full): a #GFileInputStream or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileInputStream *
 g_file_read_finish (GFile         *file,
-                   GAsyncResult  *res,
-                   GError       **error)
+                    GAsyncResult  *res,
+                    GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return NULL;
-    }
-  
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->read_finish) (file, res, error);
 }
 
 /**
  * g_file_append_to_async:
- * @file: input #GFile.
- * @flags: a set of #GFileCreateFlags.
- * @io_priority: the <link linkend="io-priority">I/O priority</link> 
- *     of the request. 
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @file: input #GFile
+ * @flags: a set of #GFileCreateFlags
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call
+ *     when the request is satisfied
  * @user_data: (closure): the data to pass to callback function
- * 
+ *
  * Asynchronously opens @file for appending.
  *
  * For more details, see g_file_append_to() which is
  * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_append_to_finish() to get the result of the operation.
- **/
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_append_to_finish() to get the result
+ * of the operation.
+ */
 void
 g_file_append_to_async (GFile               *file,
-                       GFileCreateFlags     flags,
-                       int                  io_priority,
-                       GCancellable        *cancellable,
-                       GAsyncReadyCallback  callback,
-                       gpointer             user_data)
+                        GFileCreateFlags     flags,
+                        int                  io_priority,
+                        GCancellable        *cancellable,
+                        GAsyncReadyCallback  callback,
+                        gpointer             user_data)
 {
   GFileIface *iface;
-  
+
   g_return_if_fail (G_IS_FILE (file));
 
   iface = G_FILE_GET_IFACE (file);
   (* iface->append_to_async) (file,
-                             flags,
-                             io_priority,
-                             cancellable,
-                             callback,
-                             user_data);
+                              flags,
+                              io_priority,
+                              cancellable,
+                              callback,
+                              user_data);
 }
 
 /**
  * g_file_append_to_finish:
- * @file: input #GFile.
+ * @file: input #GFile
  * @res: #GAsyncResult
  * @error: a #GError, or %NULL
- * 
- * Finishes an asynchronous file append operation started with 
- * g_file_append_to_async(). 
- * 
- * Returns: (transfer full): a valid #GFileOutputStream or %NULL on error.
+ *
+ * Finishes an asynchronous file append operation started with
+ * g_file_append_to_async().
+ *
+ * Returns: (transfer full): a valid #GFileOutputStream
+ *     or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileOutputStream *
 g_file_append_to_finish (GFile         *file,
-                        GAsyncResult  *res,
-                        GError       **error)
+                         GAsyncResult  *res,
+                         GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return NULL;
-    }
-  
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->append_to_finish) (file, res, error);
 }
 
 /**
  * g_file_create_async:
- * @file: input #GFile.
- * @flags: a set of #GFileCreateFlags.
- * @io_priority: the <link linkend="io-priority">I/O priority</link> 
- *     of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @file: input #GFile
+ * @flags: a set of #GFileCreateFlags
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call
+ *     when the request is satisfied
  * @user_data: (closure): the data to pass to callback function
- * 
- * Asynchronously creates a new file and returns an output stream for writing to it.
- * The file must not already exist.
+ *
+ * Asynchronously creates a new file and returns an output stream
+ * for writing to it. The file must not already exist.
  *
  * For more details, see g_file_create() which is
  * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_create_finish() to get the result of the operation.
- **/
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_create_finish() to get the result
+ * of the operation.
+ */
 void
 g_file_create_async (GFile               *file,
-                    GFileCreateFlags     flags,
-                    int                  io_priority,
-                    GCancellable        *cancellable,
-                    GAsyncReadyCallback  callback,
-                    gpointer             user_data)
+                     GFileCreateFlags     flags,
+                     int                  io_priority,
+                     GCancellable        *cancellable,
+                     GAsyncReadyCallback  callback,
+                     gpointer             user_data)
 {
   GFileIface *iface;
-  
+
   g_return_if_fail (G_IS_FILE (file));
 
   iface = G_FILE_GET_IFACE (file);
   (* iface->create_async) (file,
-                          flags,
-                          io_priority,
-                          cancellable,
-                          callback,
-                          user_data);
+                           flags,
+                           io_priority,
+                           cancellable,
+                           callback,
+                           user_data);
 }
 
 /**
  * g_file_create_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult
+ * @file: input #GFile
+ * @res: a #GAsyncResult
  * @error: a #GError, or %NULL
- * 
- * Finishes an asynchronous file create operation started with 
- * g_file_create_async(). 
- * 
+ *
+ * Finishes an asynchronous file create operation started with
+ * g_file_create_async().
+ *
  * Returns: (transfer full): a #GFileOutputStream or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileOutputStream *
 g_file_create_finish (GFile         *file,
-                     GAsyncResult  *res,
-                     GError       **error)
+                      GAsyncResult  *res,
+                      GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return NULL;
-    }
-  
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->create_finish) (file, res, error);
 }
 
 /**
  * g_file_replace_async:
- * @file: input #GFile.
- * @etag: (allow-none): an <link linkend="gfile-etag">entity tag</link> for the 
- *     current #GFile, or NULL to ignore.
- * @make_backup: %TRUE if a backup should be created.
- * @flags: a set of #GFileCreateFlags.
- * @io_priority: the <link linkend="io-priority">I/O priority</link> 
- *     of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @file: input #GFile
+ * @etag: (allow-none): an [entity tag][gfile-etag] for the current #GFile,
+ *     or %NULL to ignore
+ * @make_backup: %TRUE if a backup should be created
+ * @flags: a set of #GFileCreateFlags
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call
+ *     when the request is satisfied
  * @user_data: (closure): the data to pass to callback function
  *
- * Asynchronously overwrites the file, replacing the contents, possibly
- * creating a backup copy of the file first.
+ * Asynchronously overwrites the file, replacing the contents,
+ * possibly creating a backup copy of the file first.
  *
  * For more details, see g_file_replace() which is
  * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_replace_finish() to get the result of the operation.
- **/
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_replace_finish() to get the result
+ * of the operation.
+ */
 void
 g_file_replace_async (GFile               *file,
-                     const char          *etag,
-                     gboolean             make_backup,
-                     GFileCreateFlags     flags,
-                     int                  io_priority,
-                     GCancellable        *cancellable,
-                     GAsyncReadyCallback  callback,
-                     gpointer             user_data)
+                      const char          *etag,
+                      gboolean             make_backup,
+                      GFileCreateFlags     flags,
+                      int                  io_priority,
+                      GCancellable        *cancellable,
+                      GAsyncReadyCallback  callback,
+                      gpointer             user_data)
 {
   GFileIface *iface;
-  
+
   g_return_if_fail (G_IS_FILE (file));
 
   iface = G_FILE_GET_IFACE (file);
   (* iface->replace_async) (file,
-                           etag,
-                           make_backup,
-                           flags,
-                           io_priority,
-                           cancellable,
-                           callback,
-                           user_data);
+                            etag,
+                            make_backup,
+                            flags,
+                            io_priority,
+                            cancellable,
+                            callback,
+                            user_data);
 }
 
 /**
  * g_file_replace_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult
+ * @file: input #GFile
+ * @res: a #GAsyncResult
  * @error: a #GError, or %NULL
- * 
- * Finishes an asynchronous file replace operation started with 
- * g_file_replace_async(). 
- * 
+ *
+ * Finishes an asynchronous file replace operation started with
+ * g_file_replace_async().
+ *
  * Returns: (transfer full): a #GFileOutputStream, or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFileOutputStream *
 g_file_replace_finish (GFile         *file,
-                      GAsyncResult  *res,
-                      GError       **error)
+                       GAsyncResult  *res,
+                       GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return NULL;
-    }
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
 
   iface = G_FILE_GET_IFACE (file);
   return (* iface->replace_finish) (file, res, error);
 }
 
-
 /**
- * g_file_open_readwrite_async:
- * @file: input #GFile.
- * @io_priority: the <link linkend="io-priority">I/O priority</link>
- *     of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * g_file_open_readwrite_async
+ * @file: input #GFile
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call
+ *     when the request is satisfied
  * @user_data: (closure): the data to pass to callback function
  *
  * Asynchronously opens @file for reading and writing.
@@ -2153,17 +2255,18 @@ g_file_replace_finish (GFile         *file,
  * For more details, see g_file_open_readwrite() which is
  * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_open_readwrite_finish() to get the result of the operation.
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_open_readwrite_finish() to get
+ * the result of the operation.
  *
  * Since: 2.22
- **/
+ */
 void
-g_file_open_readwrite_async (GFile                      *file,
-                             int                         io_priority,
-                             GCancellable               *cancellable,
-                             GAsyncReadyCallback         callback,
-                             gpointer                    user_data)
+g_file_open_readwrite_async (GFile               *file,
+                             int                  io_priority,
+                             GCancellable        *cancellable,
+                             GAsyncReadyCallback  callback,
+                             gpointer             user_data)
 {
   GFileIface *iface;
 
@@ -2179,8 +2282,8 @@ g_file_open_readwrite_async (GFile                      *file,
 
 /**
  * g_file_open_readwrite_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult.
+ * @file: input #GFile
+ * @res: a #GAsyncResult
  * @error: a #GError, or %NULL
  *
  * Finishes an asynchronous file read operation started with
@@ -2190,47 +2293,44 @@ g_file_open_readwrite_async (GFile                      *file,
  *     Free the returned object with g_object_unref().
  *
  * Since: 2.22
- **/
+ */
 GFileIOStream *
-g_file_open_readwrite_finish (GFile                      *file,
-                              GAsyncResult               *res,
-                              GError                    **error)
+g_file_open_readwrite_finish (GFile         *file,
+                              GAsyncResult  *res,
+                              GError       **error)
 {
   GFileIface *iface;
 
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-        return NULL;
-    }
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
 
   iface = G_FILE_GET_IFACE (file);
   return (* iface->open_readwrite_finish) (file, res, error);
 }
 
-
 /**
  * g_file_create_readwrite_async:
  * @file: input #GFile
  * @flags: a set of #GFileCreateFlags
- * @io_priority: the <link linkend="io-priority">I/O priority</link>
- *     of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call
+ *     when the request is satisfied
  * @user_data: (closure): the data to pass to callback function
  *
- * Asynchronously creates a new file and returns a stream for reading and
- * writing to it. The file must not already exist.
+ * Asynchronously creates a new file and returns a stream
+ * for reading and writing to it. The file must not already exist.
  *
  * For more details, see g_file_create_readwrite() which is
  * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then
- * call g_file_create_readwrite_finish() to get the result of the operation.
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_create_readwrite_finish() to get
+ * the result of the operation.
  *
  * Since: 2.22
  */
@@ -2268,7 +2368,7 @@ g_file_create_readwrite_async (GFile               *file,
  *     Free the returned object with g_object_unref().
  *
  * Since: 2.22
- **/
+ */
 GFileIOStream *
 g_file_create_readwrite_finish (GFile         *file,
                                 GAsyncResult  *res,
@@ -2279,12 +2379,8 @@ g_file_create_readwrite_finish (GFile         *file,
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-        return NULL;
-    }
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
 
   iface = G_FILE_GET_IFACE (file);
   return (* iface->create_readwrite_finish) (file, res, error);
@@ -2292,25 +2388,28 @@ g_file_create_readwrite_finish (GFile         *file,
 
 /**
  * g_file_replace_readwrite_async:
- * @file: input #GFile.
- * @etag: (allow-none): an <link linkend="gfile-etag">entity tag</link> for the
- *     current #GFile, or NULL to ignore.
- * @make_backup: %TRUE if a backup should be created.
- * @flags: a set of #GFileCreateFlags.
- * @io_priority: the <link linkend="io-priority">I/O priority</link>
- *     of the request.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @file: input #GFile
+ * @etag: (allow-none): an [entity tag][gfile-etag] for the current #GFile,
+ *     or %NULL to ignore
+ * @make_backup: %TRUE if a backup should be created
+ * @flags: a set of #GFileCreateFlags
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call
+ *     when the request is satisfied
  * @user_data: (closure): the data to pass to callback function
  *
- * Asynchronously overwrites the file in read-write mode, replacing the
- * contents, possibly creating a backup copy of the file first.
+ * Asynchronously overwrites the file in read-write mode,
+ * replacing the contents, possibly creating a backup copy
+ * of the file first.
  *
  * For more details, see g_file_replace_readwrite() which is
  * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then
- * call g_file_replace_readwrite_finish() to get the result of the operation.
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_replace_readwrite_finish() to get
+ * the result of the operation.
  *
  * Since: 2.22
  */
@@ -2341,8 +2440,8 @@ g_file_replace_readwrite_async (GFile               *file,
 
 /**
  * g_file_replace_readwrite_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult.
+ * @file: input #GFile
+ * @res: a #GAsyncResult
  * @error: a #GError, or %NULL
  *
  * Finishes an asynchronous file replace operation started with
@@ -2363,12 +2462,8 @@ g_file_replace_readwrite_finish (GFile         *file,
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-        return NULL;
-    }
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
 
   iface = G_FILE_GET_IFACE (file);
   return (* iface->replace_readwrite_finish) (file, res, error);
@@ -2376,10 +2471,10 @@ g_file_replace_readwrite_finish (GFile         *file,
 
 static gboolean
 copy_symlink (GFile           *destination,
-             GFileCopyFlags   flags,
-             GCancellable    *cancellable,
-             const char      *target,
-             GError         **error)
+              GFileCopyFlags   flags,
+              GCancellable    *cancellable,
+              const char      *target,
+              GError         **error)
 {
   GError *my_error;
   gboolean tried_delete;
@@ -2393,35 +2488,34 @@ copy_symlink (GFile           *destination,
   if (!g_file_make_symbolic_link (destination, target, cancellable, &my_error))
     {
       /* Maybe it already existed, and we want to overwrite? */
-      if (!tried_delete && (flags & G_FILE_COPY_OVERWRITE) && 
-         my_error->domain == G_IO_ERROR && my_error->code == G_IO_ERROR_EXISTS)
-       {
-         g_error_free (my_error);
-
-
-         /* Don't overwrite if the destination is a directory */
-         info = g_file_query_info (destination, G_FILE_ATTRIBUTE_STANDARD_TYPE,
-                                   G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                   cancellable, &my_error);
-         if (info != NULL)
-           {
-             file_type = g_file_info_get_file_type (info);
-             g_object_unref (info);
-             
-             if (file_type == G_FILE_TYPE_DIRECTORY)
-               {
-                 g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY,
+      if (!tried_delete && (flags & G_FILE_COPY_OVERWRITE) &&
+          my_error->domain == G_IO_ERROR && my_error->code == G_IO_ERROR_EXISTS)
+        {
+          g_clear_error (&my_error);
+
+          /* Don't overwrite if the destination is a directory */
+          info = g_file_query_info (destination, G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                    G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                    cancellable, &my_error);
+          if (info != NULL)
+            {
+              file_type = g_file_info_get_file_type (info);
+              g_object_unref (info);
+
+              if (file_type == G_FILE_TYPE_DIRECTORY)
+                {
+                  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY,
                                        _("Can't copy over directory"));
-                 return FALSE;
-               }
-           }
-         
-         if (!g_file_delete (destination, cancellable, error))
-           return FALSE;
-         
-         tried_delete = TRUE;
-         goto retry;
-       }
+                  return FALSE;
+                }
+            }
+
+          if (!g_file_delete (destination, cancellable, error))
+            return FALSE;
+
+          tried_delete = TRUE;
+          goto retry;
+        }
             /* Nah, fail */
       g_propagate_error (error, my_error);
       return FALSE;
@@ -2430,73 +2524,73 @@ copy_symlink (GFile           *destination,
   return TRUE;
 }
 
-static GInputStream *
+static GFileInputStream *
 open_source_for_copy (GFile           *source,
-                     GFile           *destination,
-                     GFileCopyFlags   flags,
-                     GCancellable    *cancellable,
-                     GError         **error)
+                      GFile           *destination,
+                      GFileCopyFlags   flags,
+                      GCancellable    *cancellable,
+                      GError         **error)
 {
   GError *my_error;
-  GInputStream *in;
+  GFileInputStream *ret;
   GFileInfo *info;
   GFileType file_type;
-  
+
   my_error = NULL;
-  in = (GInputStream *)g_file_read (source, cancellable, &my_error);
-  if (in != NULL)
-    return in;
+  ret = g_file_read (source, cancellable, &my_error);
+  if (ret != NULL)
+    return ret;
 
   /* There was an error opening the source, try to set a good error for it: */
-
   if (my_error->domain == G_IO_ERROR && my_error->code == G_IO_ERROR_IS_DIRECTORY)
     {
-      /* The source is a directory, don't fail with WOULD_RECURSE immediately, 
-       * as that is less useful to the app. Better check for errors on the 
-       * target instead. 
+      /* The source is a directory, don't fail with WOULD_RECURSE immediately,
+       * as that is less useful to the app. Better check for errors on the
+       * target instead.
        */
       g_error_free (my_error);
       my_error = NULL;
-      
+
       info = g_file_query_info (destination, G_FILE_ATTRIBUTE_STANDARD_TYPE,
-                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                               cancellable, &my_error);
+                                G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                cancellable, &my_error);
       if (info != NULL &&
           g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_TYPE))
-       {
-         file_type = g_file_info_get_file_type (info);
-         g_object_unref (info);
-         
-         if (flags & G_FILE_COPY_OVERWRITE)
-           {
-             if (file_type == G_FILE_TYPE_DIRECTORY)
-               {
-                 g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_WOULD_MERGE,
+        {
+          file_type = g_file_info_get_file_type (info);
+          g_object_unref (info);
+
+          if (flags & G_FILE_COPY_OVERWRITE)
+            {
+              if (file_type == G_FILE_TYPE_DIRECTORY)
+                {
+                  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_WOULD_MERGE,
                                        _("Can't copy directory over directory"));
-                 return NULL;
-               }
-             /* continue to would_recurse error */
-           }
-         else
-           {
-             g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_EXISTS,
+                  return NULL;
+                }
+              /* continue to would_recurse error */
+            }
+          else
+            {
+              g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_EXISTS,
                                    _("Target file exists"));
-             return NULL;
-           }
-       }
+              return NULL;
+            }
+        }
       else
-       {
-         /* Error getting info from target, return that error 
-           * (except for NOT_FOUND, which is no error here) 
+        {
+          /* Error getting info from target, return that error
+           * (except for NOT_FOUND, which is no error here)
            */
-         if (my_error != NULL && !g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
-           {
-             g_propagate_error (error, my_error);
-             return NULL;
-           }
-         g_clear_error (&my_error);
-       }
-      
+          g_clear_object (&info);
+          if (my_error != NULL && !g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
+            {
+              g_propagate_error (error, my_error);
+              return NULL;
+            }
+          g_clear_error (&my_error);
+        }
+
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_WOULD_RECURSE,
                            _("Can't recursively copy directory"));
       return NULL;
@@ -2507,76 +2601,110 @@ open_source_for_copy (GFile           *source,
 }
 
 static gboolean
-should_copy (GFileAttributeInfo *info, 
-             gboolean            as_move,
+should_copy (GFileAttributeInfo *info,
+             gboolean            copy_all_attributes,
              gboolean            skip_perms)
 {
   if (skip_perms && strcmp(info->name, "unix::mode") == 0)
         return FALSE;
 
-  if (as_move)
+  if (copy_all_attributes)
     return info->flags & G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED;
   return info->flags & G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE;
 }
 
-static char *
-build_attribute_list_for_copy (GFileAttributeInfoList *attributes,
-                              GFileAttributeInfoList *namespaces,
-                              gboolean                as_move,
-                              gboolean                skip_perms)
-{
-  GString *s;
+static gboolean
+build_attribute_list_for_copy (GFile                  *file,
+                               GFileCopyFlags          flags,
+                               char                  **out_attributes,
+                               GCancellable           *cancellable,
+                               GError                **error)
+{
+  gboolean ret = FALSE;
+  GFileAttributeInfoList *attributes = NULL, *namespaces = NULL;
+  GString *s = NULL;
   gboolean first;
   int i;
-  
+  gboolean copy_all_attributes;
+  gboolean skip_perms;
+
+  copy_all_attributes = flags & G_FILE_COPY_ALL_METADATA;
+  skip_perms = (flags & G_FILE_COPY_TARGET_DEFAULT_PERMS) != 0;
+
+  /* Ignore errors here, if the target supports no attributes there is
+   * nothing to copy.  We still honor the cancellable though.
+   */
+  attributes = g_file_query_settable_attributes (file, cancellable, NULL);
+  if (g_cancellable_set_error_if_cancelled (cancellable, error))
+    goto out;
+
+  namespaces = g_file_query_writable_namespaces (file, cancellable, NULL);
+  if (g_cancellable_set_error_if_cancelled (cancellable, error))
+    goto out;
+
+  if (attributes == NULL && namespaces == NULL)
+    goto out;
+
   first = TRUE;
   s = g_string_new ("");
 
   if (attributes)
     {
       for (i = 0; i < attributes->n_infos; i++)
-       {
-         if (should_copy (&attributes->infos[i], as_move, skip_perms))
-           {
-             if (first)
-               first = FALSE;
-             else
-               g_string_append_c (s, ',');
-               
-             g_string_append (s, attributes->infos[i].name);
-           }
-       }
+        {
+          if (should_copy (&attributes->infos[i], copy_all_attributes, skip_perms))
+            {
+              if (first)
+                first = FALSE;
+              else
+                g_string_append_c (s, ',');
+
+              g_string_append (s, attributes->infos[i].name);
+            }
+        }
     }
 
   if (namespaces)
     {
       for (i = 0; i < namespaces->n_infos; i++)
-       {
-         if (should_copy (&namespaces->infos[i], as_move, FALSE))
-           {
-             if (first)
-               first = FALSE;
-             else
-               g_string_append_c (s, ',');
-               
-             g_string_append (s, namespaces->infos[i].name);
-             g_string_append (s, "::*");
-           }
-       }
+        {
+          if (should_copy (&namespaces->infos[i], copy_all_attributes, FALSE))
+            {
+              if (first)
+                first = FALSE;
+              else
+                g_string_append_c (s, ',');
+
+              g_string_append (s, namespaces->infos[i].name);
+              g_string_append (s, "::*");
+            }
+        }
     }
 
-  return g_string_free (s, FALSE);
+  ret = TRUE;
+  *out_attributes = g_string_free (s, FALSE);
+  s = NULL;
+ out:
+  if (s)
+    g_string_free (s, TRUE);
+  if (attributes)
+    g_file_attribute_info_list_unref (attributes);
+  if (namespaces)
+    g_file_attribute_info_list_unref (namespaces);
+  
+  return ret;
 }
 
 /**
  * g_file_copy_attributes:
- * @source: a #GFile with attributes.
- * @destination: a #GFile to copy attributes to.
- * @flags: a set of #GFileCopyFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: a #GError, %NULL to ignore.
+ * @source: a #GFile with attributes
+ * @destination: a #GFile to copy attributes to
+ * @flags: a set of #GFileCopyFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError, %NULL to ignore
  *
- * Copies the file attributes from @source to @destination. 
+ * Copies the file attributes from @source to @destination.
  *
  * Normally only a subset of the file attributes are copied,
  * those that are copies in a normal file copy operation
@@ -2585,71 +2713,59 @@ build_attribute_list_for_copy (GFileAttributeInfoList *attributes,
  * all the metadata that is possible to copy is copied. This
  * is useful when implementing move by copy + delete source.
  *
- * Returns: %TRUE if the attributes were copied successfully, %FALSE otherwise.
- **/
+ * Returns: %TRUE if the attributes were copied successfully,
+ *     %FALSE otherwise.
+ */
 gboolean
 g_file_copy_attributes (GFile           *source,
-                       GFile           *destination,
-                       GFileCopyFlags   flags,
-                       GCancellable    *cancellable,
-                       GError         **error)
+                        GFile           *destination,
+                        GFileCopyFlags   flags,
+                        GCancellable    *cancellable,
+                        GError         **error)
 {
-  GFileAttributeInfoList *attributes, *namespaces;
   char *attrs_to_read;
   gboolean res;
   GFileInfo *info;
-  gboolean as_move;
   gboolean source_nofollow_symlinks;
-  gboolean skip_perms;
 
-  as_move = flags & G_FILE_COPY_ALL_METADATA;
-  source_nofollow_symlinks = flags & G_FILE_COPY_NOFOLLOW_SYMLINKS;
-  skip_perms = (flags & G_FILE_COPY_TARGET_DEFAULT_PERMS) != 0;
-
-  /* Ignore errors here, if the target supports no attributes there is nothing to copy */
-  attributes = g_file_query_settable_attributes (destination, cancellable, NULL);
-  namespaces = g_file_query_writable_namespaces (destination, cancellable, NULL);
-
-  if (attributes == NULL && namespaces == NULL)
-    return TRUE;
+  if (!build_attribute_list_for_copy (destination, flags, &attrs_to_read,
+                                      cancellable, error))
+    return FALSE;
 
-  attrs_to_read = build_attribute_list_for_copy (attributes, namespaces, as_move, skip_perms);
+  source_nofollow_symlinks = flags & G_FILE_COPY_NOFOLLOW_SYMLINKS;
 
   /* Ignore errors here, if we can't read some info (e.g. if it doesn't exist)
-   * we just don't copy it. 
+   * we just don't copy it.
    */
   info = g_file_query_info (source, attrs_to_read,
-                           source_nofollow_symlinks ? G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS:0,
-                           cancellable,
-                           NULL);
+                            source_nofollow_symlinks ? G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS:0,
+                            cancellable,
+                            NULL);
 
   g_free (attrs_to_read);
-  
+
   res = TRUE;
   if  (info)
     {
       res = g_file_set_attributes_from_info (destination,
-                                            info,
-                         G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                            cancellable,
-                                            error);
+                                             info,
+                                             G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                             cancellable,
+                                             error);
       g_object_unref (info);
     }
-  
-  g_file_attribute_info_list_unref (attributes);
-  g_file_attribute_info_list_unref (namespaces);
-  
+
   return res;
 }
 
 static gboolean
 copy_stream_with_progress (GInputStream           *in,
-                          GOutputStream          *out,
+                           GOutputStream          *out,
                            GFile                  *source,
-                          GCancellable           *cancellable,
-                          GFileProgressCallback   progress_callback,
-                          gpointer                progress_callback_data,
-                          GError                **error)
+                           GCancellable           *cancellable,
+                           GFileProgressCallback   progress_callback,
+                           gpointer                progress_callback_data,
+                           GError                **error)
 {
   gssize n_read, n_written;
   goffset current_size;
@@ -2674,7 +2790,7 @@ copy_stream_with_progress (GInputStream           *in,
 
       if (total_size == -1)
         {
-          info = g_file_query_info (source, 
+          info = g_file_query_info (source,
                                     G_FILE_ATTRIBUTE_STANDARD_SIZE,
                                     G_FILE_QUERY_INFO_NONE,
                                     cancellable, NULL);
@@ -2689,42 +2805,42 @@ copy_stream_with_progress (GInputStream           *in,
 
   if (total_size == -1)
     total_size = 0;
-  
+
   current_size = 0;
   res = TRUE;
   while (TRUE)
     {
       n_read = g_input_stream_read (in, buffer, sizeof (buffer), cancellable, error);
       if (n_read == -1)
-       {
-         res = FALSE;
-         break;
-       }
-       
+        {
+          res = FALSE;
+          break;
+        }
+
       if (n_read == 0)
-       break;
+        break;
 
       current_size += n_read;
 
       p = buffer;
       while (n_read > 0)
-       {
-         n_written = g_output_stream_write (out, p, n_read, cancellable, error);
-         if (n_written == -1)
-           {
-             res = FALSE;
-             break;
-           }
-
-         p += n_written;
-         n_read -= n_written;
-       }
+        {
+          n_written = g_output_stream_write (out, p, n_read, cancellable, error);
+          if (n_written == -1)
+            {
+              res = FALSE;
+              break;
+            }
+
+          p += n_written;
+          n_read -= n_written;
+        }
 
       if (!res)
         break;
 
       if (progress_callback)
-       progress_callback (current_size, total_size, progress_callback_data);
+        progress_callback (current_size, total_size, progress_callback_data);
     }
 
   /* Make sure we send full copied size */
@@ -2738,9 +2854,9 @@ copy_stream_with_progress (GInputStream           *in,
 
 static gboolean
 do_splice (int     fd_in,
-          loff_t *off_in,
+           loff_t *off_in,
            int     fd_out,
-          loff_t *off_out,
+           loff_t *off_out,
            size_t  len,
            long   *bytes_transferd,
            GError **error)
@@ -2780,7 +2896,7 @@ splice_stream_with_progress (GInputStream           *in,
                              gpointer                progress_callback_data,
                              GError                **error)
 {
-  int buffer[2];
+  int buffer[2] = { -1, -1 };
   gboolean res;
   goffset total_size;
   loff_t offset_in;
@@ -2790,12 +2906,8 @@ splice_stream_with_progress (GInputStream           *in,
   fd_in = g_file_descriptor_based_get_fd (G_FILE_DESCRIPTOR_BASED (in));
   fd_out = g_file_descriptor_based_get_fd (G_FILE_DESCRIPTOR_BASED (out));
 
-  if (pipe (buffer) != 0)
-    {
-      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                           "Pipe creation failed");
-      return FALSE;
-    }
+  if (!g_unix_open_pipe (buffer, FD_CLOEXEC, error))
+    return FALSE;
 
   total_size = -1;
   /* avoid performance impact of querying total size when it's not needed */
@@ -2848,41 +2960,106 @@ splice_stream_with_progress (GInputStream           *in,
   if (progress_callback)
     progress_callback (offset_in, total_size, progress_callback_data);
 
+  if (!g_close (buffer[0], error))
+    goto out;
+  buffer[0] = -1;
+  if (!g_close (buffer[1], error))
+    goto out;
+  buffer[1] = -1;
  out:
-  close (buffer[0]);
-  close (buffer[1]);
+  if (buffer[0] != -1)
+    (void) g_close (buffer[0], NULL);
+  if (buffer[1] != -1)
+    (void) g_close (buffer[1], NULL);
 
   return res;
 }
 #endif
 
+#ifdef __linux__
+static gboolean
+btrfs_reflink_with_progress (GInputStream           *in,
+                             GOutputStream          *out,
+                             GFileInfo              *info,
+                             GCancellable           *cancellable,
+                             GFileProgressCallback   progress_callback,
+                             gpointer                progress_callback_data,
+                             GError                **error)
+{
+  goffset source_size;
+  int fd_in, fd_out;
+  int ret;
+
+  fd_in = g_file_descriptor_based_get_fd (G_FILE_DESCRIPTOR_BASED (in));
+  fd_out = g_file_descriptor_based_get_fd (G_FILE_DESCRIPTOR_BASED (out));
+
+  if (progress_callback)
+    source_size = g_file_info_get_size (info);
+
+  /* Btrfs clone ioctl properties:
+   *  - Works at the inode level
+   *  - Doesn't work with directories
+   *  - Always follows symlinks (source and destination)
+   *
+   * By the time we get here, *in and *out are both regular files */
+  ret = ioctl (fd_out, BTRFS_IOC_CLONE, fd_in);
+
+  if (ret < 0)
+    {
+      if (errno == EXDEV)
+       g_set_error_literal (error, G_IO_ERROR,
+                            G_IO_ERROR_NOT_SUPPORTED,
+                            _("Copy (reflink/clone) between mounts is not supported"));
+      else if (errno == EINVAL)
+       g_set_error_literal (error, G_IO_ERROR,
+                            G_IO_ERROR_NOT_SUPPORTED,
+                            _("Copy (reflink/clone) is not supported or invalid"));
+      else
+       /* Most probably something odd happened; retry with fallback */
+       g_set_error_literal (error, G_IO_ERROR,
+                            G_IO_ERROR_NOT_SUPPORTED,
+                            _("Copy (reflink/clone) is not supported or didn't work"));
+      /* We retry with fallback for all error cases because Btrfs is currently
+       * unstable, and so we can't trust it to do clone properly.
+       * In addition, any hard errors here would cause the same failure in the
+       * fallback manual copy as well. */
+      return FALSE;
+    }
+
+  /* Make sure we send full copied size */
+  if (progress_callback)
+    progress_callback (source_size, source_size, progress_callback_data);
+
+  return TRUE;
+}
+#endif
+
 static gboolean
 file_copy_fallback (GFile                  *source,
-                   GFile                  *destination,
-                   GFileCopyFlags          flags,
-                   GCancellable           *cancellable,
-                   GFileProgressCallback   progress_callback,
-                   gpointer                progress_callback_data,
-                   GError                **error)
-{
-  GInputStream *in;
-  GOutputStream *out;
-  GFileInfo *info;
+                    GFile                  *destination,
+                    GFileCopyFlags          flags,
+                    GCancellable           *cancellable,
+                    GFileProgressCallback   progress_callback,
+                    gpointer                progress_callback_data,
+                    GError                **error)
+{
+  gboolean ret = FALSE;
+  GFileInputStream *file_in = NULL;
+  GInputStream *in = NULL;
+  GOutputStream *out = NULL;
+  GFileInfo *info = NULL;
   const char *target;
-  gboolean result;
-#ifdef HAVE_SPLICE
-  gboolean fallback = TRUE;
-#endif
+  char *attrs_to_read;
+  gboolean do_set_attributes = FALSE;
 
   /* need to know the file type */
   info = g_file_query_info (source,
-                           G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET,
-                           G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                           cancellable,
-                           error);
-
-  if (info == NULL)
-         return FALSE;
+                            G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET,
+                            G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                            cancellable,
+                            error);
+  if (!info)
+    goto out;
 
   /* Maybe copy the symlink? */
   if ((flags & G_FILE_COPY_NOFOLLOW_SYMLINKS) &&
@@ -2890,108 +3067,211 @@ file_copy_fallback (GFile                  *source,
     {
       target = g_file_info_get_symlink_target (info);
       if (target)
-       {
-         if (!copy_symlink (destination, flags, cancellable, target, error))
-           {
-             g_object_unref (info);
-             return FALSE;
-           }
-         
-         g_object_unref (info);
-         goto copied_file;
-       }
+        {
+          if (!copy_symlink (destination, flags, cancellable, target, error))
+            goto out;
+
+          ret = TRUE;
+          goto out;
+        }
         /* ... else fall back on a regular file copy */
-       g_object_unref (info);
     }
   /* Handle "special" files (pipes, device nodes, ...)? */
   else if (g_file_info_get_file_type (info) == G_FILE_TYPE_SPECIAL)
     {
       /* FIXME: could try to recreate device nodes and others? */
-
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
                            _("Can't copy special file"));
-      g_object_unref (info);
-      return FALSE;
+      goto out;
     }
+
   /* Everything else should just fall back on a regular copy. */
-  else
-    g_object_unref (info);
 
-  in = open_source_for_copy (source, destination, flags, cancellable, error);
-  if (in == NULL)
-    return FALSE;
-  
-  if (flags & G_FILE_COPY_OVERWRITE)
+  file_in = open_source_for_copy (source, destination, flags, cancellable, error);
+  if (!file_in)
+    goto out;
+  in = G_INPUT_STREAM (file_in);
+
+  if (!build_attribute_list_for_copy (destination, flags, &attrs_to_read,
+                                      cancellable, error))
+    goto out;
+
+  if (attrs_to_read != NULL)
+    {
+      GError *tmp_error = NULL;
+
+      /* Ok, ditch the previous lightweight info (on Unix we just
+       * called lstat()); at this point we gather all the information
+       * we need about the source from the opened file descriptor.
+       */
+      g_object_unref (info);
+
+      info = g_file_input_stream_query_info (file_in, attrs_to_read,
+                                             cancellable, &tmp_error);
+      if (!info)
+        {
+          /* Not all gvfs backends implement query_info_on_read(), we
+           * can just fall back to the pathname again.
+           * https://bugzilla.gnome.org/706254
+           */
+          if (g_error_matches (tmp_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
+            {
+              g_clear_error (&tmp_error);
+              info = g_file_query_info (source, attrs_to_read, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                        cancellable, error);
+            }
+          else
+            {
+              g_free (attrs_to_read);
+              g_propagate_error (error, tmp_error);
+              goto out;
+            }
+        }
+      g_free (attrs_to_read);
+      if (!info)
+        goto out;
+
+      do_set_attributes = TRUE;
+    }
+
+  /* In the local file path, we pass down the source info which
+   * includes things like unix::mode, to ensure that the target file
+   * is not created with different permissions from the source file.
+   *
+   * If a future API like g_file_replace_with_info() is added, switch
+   * this code to use that.
+   */
+  if (G_IS_LOCAL_FILE (destination))
+    {
+      if (flags & G_FILE_COPY_OVERWRITE)
+        out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
+                                                                   FALSE, NULL,
+                                                                   flags & G_FILE_COPY_BACKUP,
+                                                                   G_FILE_CREATE_REPLACE_DESTINATION,
+                                                                   info,
+                                                                   cancellable, error);
+      else
+        out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
+                                                                  FALSE, 0, info,
+                                                                  cancellable, error);
+    }
+  else if (flags & G_FILE_COPY_OVERWRITE)
     {
       out = (GOutputStream *)g_file_replace (destination,
-                                            NULL,
-                                            flags & G_FILE_COPY_BACKUP,
+                                             NULL,
+                                             flags & G_FILE_COPY_BACKUP,
                                              G_FILE_CREATE_REPLACE_DESTINATION,
-                                            cancellable, error);
+                                             cancellable, error);
     }
   else
     {
       out = (GOutputStream *)g_file_create (destination, 0, cancellable, error);
     }
 
-  if (out == NULL)
-    {
-      g_object_unref (in);
-      return FALSE;
-    }
+  if (!out)
+    goto out;
 
-#ifdef HAVE_SPLICE
+#ifdef __linux__
   if (G_IS_FILE_DESCRIPTOR_BASED (in) && G_IS_FILE_DESCRIPTOR_BASED (out))
     {
-      GError *splice_err = NULL;
-
-      result = splice_stream_with_progress (in, out, cancellable,
-                                            progress_callback, progress_callback_data,
-                                            &splice_err);
+      GError *reflink_err = NULL;
 
-      if (result || !g_error_matches (splice_err, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
+      if (!btrfs_reflink_with_progress (in, out, info, cancellable,
+                                        progress_callback, progress_callback_data,
+                                        &reflink_err))
         {
-          fallback = FALSE;
-          if (!result)
-            g_propagate_error (error, splice_err);
+          if (g_error_matches (reflink_err, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
+            {
+              g_clear_error (&reflink_err);
+            }
+          else
+            {
+              g_propagate_error (error, reflink_err);
+              goto out;
+            }
         }
       else
-        g_clear_error (&splice_err);
+        {
+          ret = TRUE;
+          goto out;
+        }
     }
-
-  if (fallback)
 #endif
-    result = copy_stream_with_progress (in, out, source, cancellable,
-                                       progress_callback, progress_callback_data,
-                                       error);
-
-  /* Don't care about errors in source here */
-  g_input_stream_close (in, cancellable, NULL);
 
-  /* But write errors on close are bad! */
-  if (!g_output_stream_close (out, cancellable, result ? error : NULL))
-    result = FALSE;
+#ifdef HAVE_SPLICE
+  if (G_IS_FILE_DESCRIPTOR_BASED (in) && G_IS_FILE_DESCRIPTOR_BASED (out))
+    {
+      GError *splice_err = NULL;
 
-  g_object_unref (in);
-  g_object_unref (out);
+      if (!splice_stream_with_progress (in, out, cancellable,
+                                        progress_callback, progress_callback_data,
+                                        &splice_err))
+        {
+          if (g_error_matches (splice_err, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
+            {
+              g_clear_error (&splice_err);
+            }
+          else
+            {
+              g_propagate_error (error, splice_err);
+              goto out;
+            }
+        }
+      else
+        {
+          ret = TRUE;
+          goto out;
+        }
+    }
 
-  if (result == FALSE)
-    return FALSE;
+#endif
+
+  /* A plain read/write loop */
+  if (!copy_stream_with_progress (in, out, source, cancellable,
+                                  progress_callback, progress_callback_data,
+                                  error))
+    goto out;
+
+  ret = TRUE;
+ out:
+  if (in)
+    {
+      /* Don't care about errors in source here */
+      (void) g_input_stream_close (in, cancellable, NULL);
+      g_object_unref (in);
+    }
+
+  if (out)
+    {
+      /* But write errors on close are bad! */
+      if (!g_output_stream_close (out, cancellable, ret ? error : NULL))
+        ret = FALSE;
+      g_object_unref (out);
+    }
 
- copied_file:
   /* Ignore errors here. Failure to copy metadata is not a hard error */
-  g_file_copy_attributes (source, destination,
-                         flags, cancellable, NULL);
-  
-  return TRUE;
+  /* TODO: set these attributes /before/ we do the rename() on Unix */
+  if (ret && do_set_attributes)
+    {
+      g_file_set_attributes_from_info (destination,
+                                       info,
+                                       G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                       cancellable,
+                                       NULL);
+    }
+
+  g_clear_object (&info);
+
+  return ret;
 }
 
 /**
  * g_file_copy:
- * @source: input #GFile.
+ * @source: input #GFile
  * @destination: destination #GFile
  * @flags: set of #GFileCopyFlags
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @progress_callback: (allow-none) (scope call): function to callback with
  *     progress information, or %NULL if progress information is not needed
  * @progress_callback_data: (closure): user data to pass to @progress_callback
@@ -3011,39 +3291,39 @@ file_copy_fallback (GFile                  *source,
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
- * If @progress_callback is not %NULL, then the operation can be monitored by
- * setting this to a #GFileProgressCallback function. @progress_callback_data
- * will be passed to this function. It is guaranteed that this callback will
- * be called after all data has been transferred with the total number of bytes
- * copied during the operation.
+ * If @progress_callback is not %NULL, then the operation can be monitored
+ * by setting this to a #GFileProgressCallback function.
+ * @progress_callback_data will be passed to this function. It is guaranteed
+ * that this callback will be called after all data has been transferred with
+ * the total number of bytes copied during the operation.
  *
- * If the @source file does not exist then the G_IO_ERROR_NOT_FOUND
- * error is returned, independent on the status of the @destination.
+ * If the @source file does not exist, then the %G_IO_ERROR_NOT_FOUND error
+ * is returned, independent on the status of the @destination.
  *
- * If #G_FILE_COPY_OVERWRITE is not specified and the target exists, then the
- * error G_IO_ERROR_EXISTS is returned.
+ * If #G_FILE_COPY_OVERWRITE is not specified and the target exists, then
+ * the error %G_IO_ERROR_EXISTS is returned.
  *
- * If trying to overwrite a file over a directory the G_IO_ERROR_IS_DIRECTORY
+ * If trying to overwrite a file over a directory, the %G_IO_ERROR_IS_DIRECTORY
  * error is returned. If trying to overwrite a directory with a directory the
- * G_IO_ERROR_WOULD_MERGE error is returned.
+ * %G_IO_ERROR_WOULD_MERGE error is returned.
  *
  * If the source is a directory and the target does not exist, or
  * #G_FILE_COPY_OVERWRITE is specified and the target is a file, then the
- * G_IO_ERROR_WOULD_RECURSE error is returned.
+ * %G_IO_ERROR_WOULD_RECURSE error is returned.
  *
  * If you are interested in copying the #GFile object itself (not the on-disk
  * file), see g_file_dup().
  *
  * Returns: %TRUE on success, %FALSE otherwise.
- **/
+ */
 gboolean
 g_file_copy (GFile                  *source,
-            GFile                  *destination,
-            GFileCopyFlags          flags,
-            GCancellable           *cancellable,
-            GFileProgressCallback   progress_callback,
-            gpointer                progress_callback_data,
-            GError                **error)
+             GFile                  *destination,
+             GFileCopyFlags          flags,
+             GCancellable           *cancellable,
+             GFileProgressCallback   progress_callback,
+             gpointer                progress_callback_data,
+             GError                **error)
 {
   GFileIface *iface;
   GError *my_error;
@@ -3054,68 +3334,69 @@ g_file_copy (GFile                  *source,
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return FALSE;
-  
+
   iface = G_FILE_GET_IFACE (destination);
   if (iface->copy)
     {
       my_error = NULL;
       res = (* iface->copy) (source, destination,
-                            flags, cancellable,
-                            progress_callback, progress_callback_data,
-                            &my_error);
-      
+                             flags, cancellable,
+                             progress_callback, progress_callback_data,
+                             &my_error);
+
       if (res)
-       return TRUE;
-      
+        return TRUE;
+
       if (my_error->domain != G_IO_ERROR || my_error->code != G_IO_ERROR_NOT_SUPPORTED)
-       {
-         g_propagate_error (error, my_error);
-             return FALSE;
-       }
+        {
+          g_propagate_error (error, my_error);
+              return FALSE;
+        }
       else
-       g_clear_error (&my_error);
+        g_clear_error (&my_error);
     }
 
   /* If the types are different, and the destination method failed
-     also try the source method */
+   * also try the source method
+   */
   if (G_OBJECT_TYPE (source) != G_OBJECT_TYPE (destination))
     {
       iface = G_FILE_GET_IFACE (source);
-      
+
       if (iface->copy)
-       {
-         my_error = NULL;
-         res = (* iface->copy) (source, destination,
-                                flags, cancellable,
-                                progress_callback, progress_callback_data,
-                                &my_error);
-         
-         if (res)
-           return TRUE;
-         
-         if (my_error->domain != G_IO_ERROR || my_error->code != G_IO_ERROR_NOT_SUPPORTED)
-           {
-             g_propagate_error (error, my_error);
-             return FALSE;
-           }
-         else
-           g_clear_error (&my_error);
-       }
+        {
+          my_error = NULL;
+          res = (* iface->copy) (source, destination,
+                                 flags, cancellable,
+                                 progress_callback, progress_callback_data,
+                                 &my_error);
+
+          if (res)
+            return TRUE;
+
+          if (my_error->domain != G_IO_ERROR || my_error->code != G_IO_ERROR_NOT_SUPPORTED)
+            {
+              g_propagate_error (error, my_error);
+              return FALSE;
+            }
+          else
+            g_clear_error (&my_error);
+        }
     }
-  
+
   return file_copy_fallback (source, destination, flags, cancellable,
-                            progress_callback, progress_callback_data,
-                            error);
+                             progress_callback, progress_callback_data,
+                             error);
 }
 
 /**
  * g_file_copy_async: (skip)
- * @source: input #GFile.
+ * @source: input #GFile
  * @destination: destination #GFile
  * @flags: set of #GFileCopyFlags
- * @io_priority: the <link linkend="io-priority">I/O priority</link>
- *     of the request
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @progress_callback: (allow-none): function to callback with progress
  *     information, or %NULL if progress information is not needed
  * @progress_callback_data: (closure): user data to pass to @progress_callback
@@ -3126,22 +3407,23 @@ g_file_copy (GFile                  *source,
  * asynchronously. For details of the behaviour, see g_file_copy().
  *
  * If @progress_callback is not %NULL, then that function that will be called
- * just like in g_file_copy(), however the callback will run in the main loop,
- * not in the thread that is doing the I/O operation.
+ * just like in g_file_copy(). The callback will run in the default main context
+ * of the thread calling g_file_copy_async() â€” the same context as @callback is
+ * run in.
  *
  * When the operation is finished, @callback will be called. You can then call
  * g_file_copy_finish() to get the result of the operation.
- **/
+ */
 void
 g_file_copy_async (GFile                  *source,
-                  GFile                  *destination,
-                  GFileCopyFlags          flags,
-                  int                     io_priority,
-                  GCancellable           *cancellable,
-                  GFileProgressCallback   progress_callback,
-                  gpointer                progress_callback_data,
-                  GAsyncReadyCallback     callback,
-                  gpointer                user_data)
+                   GFile                  *destination,
+                   GFileCopyFlags          flags,
+                   int                     io_priority,
+                   GCancellable           *cancellable,
+                   GFileProgressCallback   progress_callback,
+                   gpointer                progress_callback_data,
+                   GAsyncReadyCallback     callback,
+                   gpointer                user_data)
 {
   GFileIface *iface;
 
@@ -3150,65 +3432,62 @@ g_file_copy_async (GFile                  *source,
 
   iface = G_FILE_GET_IFACE (source);
   (* iface->copy_async) (source,
-                        destination,
-                        flags,
-                        io_priority,
-                        cancellable,
-                        progress_callback,
-                        progress_callback_data,
-                        callback,
-                        user_data);
+                         destination,
+                         flags,
+                         io_priority,
+                         cancellable,
+                         progress_callback,
+                         progress_callback_data,
+                         callback,
+                         user_data);
 }
 
 /**
  * g_file_copy_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult
+ * @file: input #GFile
+ * @res: a #GAsyncResult
  * @error: a #GError, or %NULL
- * 
- * Finishes copying the file started with 
- * g_file_copy_async().
- * 
+ *
+ * Finishes copying the file started with g_file_copy_async().
+ *
  * Returns: a %TRUE on success, %FALSE on error.
- **/
+ */
 gboolean
-g_file_copy_finish (GFile        *file,
-                   GAsyncResult *res,
-                   GError      **error)
+g_file_copy_finish (GFile         *file,
+                    GAsyncResult  *res,
+                    GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      
-      if (g_simple_async_result_propagate_error (simple, error))
-       return FALSE;
-    }
-  
+  if (g_async_result_legacy_propagate_error (res, error))
+    return FALSE;
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->copy_finish) (file, res, error);
 }
 
 /**
  * g_file_move:
- * @source: #GFile pointing to the source location.
- * @destination: #GFile pointing to the destination location.
- * @flags: set of #GFileCopyFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @progress_callback: (scope call): #GFileProgressCallback function for updates.
- * @progress_callback_data: (closure): gpointer to user data for the callback function.
+ * @source: #GFile pointing to the source location
+ * @destination: #GFile pointing to the destination location
+ * @flags: set of #GFileCopyFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @progress_callback: (allow-none) (scope call): #GFileProgressCallback
+ *     function for updates
+ * @progress_callback_data: (closure): gpointer to user data for
+ *     the callback function
  * @error: #GError for returning error conditions, or %NULL
  *
+ * Tries to move the file or directory @source to the location specified
+ * by @destination. If native move operations are supported then this is
+ * used, otherwise a copy + delete fallback is used. The native
+ * implementation may support moving directories (for instance on moves
+ * inside the same filesystem), but the fallback code does not.
  *
- * Tries to move the file or directory @source to the location specified by @destination.
- * If native move operations are supported then this is used, otherwise a copy + delete
- * fallback is used. The native implementation may support moving directories (for instance
- * on moves inside the same filesystem), but the fallback code does not.
- * 
  * If the flag #G_FILE_COPY_OVERWRITE is specified an already
  * existing @destination file is overwritten.
  *
@@ -3218,38 +3497,39 @@ g_file_copy_finish (GFile        *file,
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * If @progress_callback is not %NULL, then the operation can be monitored by
- * setting this to a #GFileProgressCallback function. @progress_callback_data
- * will be passed to this function. It is guaranteed that this callback will
- * be called after all data has been transferred with the total number of bytes
- * copied during the operation.
- * 
- * If the @source file does not exist then the G_IO_ERROR_NOT_FOUND
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * If @progress_callback is not %NULL, then the operation can be monitored
+ * by setting this to a #GFileProgressCallback function.
+ * @progress_callback_data will be passed to this function. It is
+ * guaranteed that this callback will be called after all data has been
+ * transferred with the total number of bytes copied during the operation.
+ *
+ * If the @source file does not exist, then the %G_IO_ERROR_NOT_FOUND
  * error is returned, independent on the status of the @destination.
  *
- * If #G_FILE_COPY_OVERWRITE is not specified and the target exists, then the
- * error G_IO_ERROR_EXISTS is returned.
+ * If #G_FILE_COPY_OVERWRITE is not specified and the target exists,
+ * then the error %G_IO_ERROR_EXISTS is returned.
  *
- * If trying to overwrite a file over a directory the G_IO_ERROR_IS_DIRECTORY
+ * If trying to overwrite a file over a directory, the %G_IO_ERROR_IS_DIRECTORY
  * error is returned. If trying to overwrite a directory with a directory the
- * G_IO_ERROR_WOULD_MERGE error is returned.
+ * %G_IO_ERROR_WOULD_MERGE error is returned.
  *
- * If the source is a directory and the target does not exist, or #G_FILE_COPY_OVERWRITE is
- * specified and the target is a file, then the G_IO_ERROR_WOULD_RECURSE error
- * may be returned (if the native move operation isn't available).
+ * If the source is a directory and the target does not exist, or
+ * #G_FILE_COPY_OVERWRITE is specified and the target is a file, then
+ * the %G_IO_ERROR_WOULD_RECURSE error may be returned (if the native
+ * move operation isn't available).
  *
  * Returns: %TRUE on successful move, %FALSE otherwise.
- **/
+ */
 gboolean
 g_file_move (GFile                  *source,
-            GFile                  *destination,
-            GFileCopyFlags          flags,
-            GCancellable           *cancellable,
-            GFileProgressCallback   progress_callback,
-            gpointer                progress_callback_data,
-            GError                **error)
+             GFile                  *destination,
+             GFileCopyFlags          flags,
+             GCancellable           *cancellable,
+             GFileProgressCallback   progress_callback,
+             gpointer                progress_callback_data,
+             GError                **error)
 {
   GFileIface *iface;
   GError *my_error;
@@ -3260,95 +3540,101 @@ g_file_move (GFile                  *source,
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return FALSE;
-  
+
   iface = G_FILE_GET_IFACE (destination);
   if (iface->move)
     {
       my_error = NULL;
       res = (* iface->move) (source, destination,
-                            flags, cancellable,
-                            progress_callback, progress_callback_data,
-                            &my_error);
-      
+                             flags, cancellable,
+                             progress_callback, progress_callback_data,
+                             &my_error);
+
       if (res)
-       return TRUE;
-      
+        return TRUE;
+
       if (my_error->domain != G_IO_ERROR || my_error->code != G_IO_ERROR_NOT_SUPPORTED)
-       {
-         g_propagate_error (error, my_error);
-         return FALSE;
-       }
+        {
+          g_propagate_error (error, my_error);
+          return FALSE;
+        }
+      else
+        g_clear_error (&my_error);
     }
 
   /* If the types are different, and the destination method failed
-     also try the source method */
+   * also try the source method
+   */
   if (G_OBJECT_TYPE (source) != G_OBJECT_TYPE (destination))
     {
       iface = G_FILE_GET_IFACE (source);
-      
+
       if (iface->move)
-       {
-         my_error = NULL;
-         res = (* iface->move) (source, destination,
-                                flags, cancellable,
-                                progress_callback, progress_callback_data,
-                                &my_error);
-         
-         if (res)
-           return TRUE;
-         
-         if (my_error->domain != G_IO_ERROR || my_error->code != G_IO_ERROR_NOT_SUPPORTED)
-           {
-             g_propagate_error (error, my_error);
-             return FALSE;
-           }
-       }
+        {
+          my_error = NULL;
+          res = (* iface->move) (source, destination,
+                                 flags, cancellable,
+                                 progress_callback, progress_callback_data,
+                                 &my_error);
+
+          if (res)
+            return TRUE;
+
+          if (my_error->domain != G_IO_ERROR || my_error->code != G_IO_ERROR_NOT_SUPPORTED)
+            {
+              g_propagate_error (error, my_error);
+              return FALSE;
+            }
+          else
+            g_clear_error (&my_error);
+        }
     }
-  
+
   if (flags & G_FILE_COPY_NO_FALLBACK_FOR_MOVE)
-    {  
+    {
       g_set_error_literal (error, G_IO_ERROR,
                            G_IO_ERROR_NOT_SUPPORTED,
                            _("Operation not supported"));
       return FALSE;
     }
-  
+
   flags |= G_FILE_COPY_ALL_METADATA;
   if (!g_file_copy (source, destination, flags, cancellable,
-                   progress_callback, progress_callback_data,
-                   error))
+                    progress_callback, progress_callback_data,
+                    error))
     return FALSE;
 
   return g_file_delete (source, cancellable, error);
 }
 
 /**
- * g_file_make_directory
- * @file: input #GFile.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: a #GError, or %NULL 
- *
- * Creates a directory. Note that this will only create a child directory of
- * the immediate parent directory of the path or URI given by the #GFile. To 
- * recursively create directories, see g_file_make_directory_with_parents().
- * This function will fail if the parent directory does not exist, setting 
- * @error to %G_IO_ERROR_NOT_FOUND. If the file system doesn't support creating
- * directories, this function will fail, setting @error to 
+ * g_file_make_directory:
+ * @file: input #GFile
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError, or %NULL
+ *
+ * Creates a directory. Note that this will only create a child directory
+ * of the immediate parent directory of the path or URI given by the #GFile.
+ * To recursively create directories, see g_file_make_directory_with_parents().
+ * This function will fail if the parent directory does not exist, setting
+ * @error to %G_IO_ERROR_NOT_FOUND. If the file system doesn't support
+ * creating directories, this function will fail, setting @error to
  * %G_IO_ERROR_NOT_SUPPORTED.
  *
  * For a local #GFile the newly created directory will have the default
  * (current) ownership and permissions of the current process.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
  * Returns: %TRUE on successful creation, %FALSE otherwise.
- **/
+ */
 gboolean
 g_file_make_directory (GFile         *file,
-                      GCancellable  *cancellable,
-                      GError       **error)
+                       GCancellable  *cancellable,
+                       GError       **error)
 {
   GFileIface *iface;
 
@@ -3356,7 +3642,7 @@ g_file_make_directory (GFile         *file,
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return FALSE;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->make_directory == NULL)
@@ -3366,90 +3652,162 @@ g_file_make_directory (GFile         *file,
                            _("Operation not supported"));
       return FALSE;
     }
-  
+
   return (* iface->make_directory) (file, cancellable, error);
 }
 
 /**
+ * g_file_make_directory_async:
+ * @file: input #GFile
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: a #GAsyncReadyCallback to call
+ *     when the request is satisfied
+ * @user_data: the data to pass to callback function
+ *
+ * Asynchronously creates a directory.
+ *
+ * Virtual: make_directory_async
+ * Since: 2.38
+ */
+void
+g_file_make_directory_async (GFile               *file,
+                             int                  io_priority,
+                             GCancellable        *cancellable,
+                             GAsyncReadyCallback  callback,
+                             gpointer             user_data)
+{
+  GFileIface *iface;
+
+  g_return_if_fail (G_IS_FILE (file));
+
+  iface = G_FILE_GET_IFACE (file);
+  (* iface->make_directory_async) (file,
+                                   io_priority,
+                                   cancellable,
+                                   callback,
+                                   user_data);
+}
+
+/**
+ * g_file_make_directory_finish:
+ * @file: input #GFile
+ * @result: a #GAsyncResult
+ * @error: a #GError, or %NULL
+ *
+ * Finishes an asynchronous directory creation, started with
+ * g_file_make_directory_async().
+ *
+ * Virtual: make_directory_finish
+ * Returns: %TRUE on successful directory creation, %FALSE otherwise.
+ * Since: 2.38
+ */
+gboolean
+g_file_make_directory_finish (GFile         *file,
+                              GAsyncResult  *result,
+                              GError       **error)
+{
+  GFileIface *iface;
+
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
+
+  iface = G_FILE_GET_IFACE (file);
+  return (* iface->make_directory_finish) (file, result, error);
+}
+
+/**
  * g_file_make_directory_with_parents:
- * @file: input #GFile.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: a #GError, or %NULL 
- *
- * Creates a directory and any parent directories that may not exist similar to
- * 'mkdir -p'. If the file system does not support creating directories, this
- * function will fail, setting @error to %G_IO_ERROR_NOT_SUPPORTED. If the
- * directory itself already exists, this function will fail setting @error
- * to %G_IO_ERROR_EXISTS, unlike the similar g_mkdir_with_parents().
- * 
+ * @file: input #GFile
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError, or %NULL
+ *
+ * Creates a directory and any parent directories that may not
+ * exist similar to 'mkdir -p'. If the file system does not support
+ * creating directories, this function will fail, setting @error to
+ * %G_IO_ERROR_NOT_SUPPORTED. If the directory itself already exists,
+ * this function will fail setting @error to %G_IO_ERROR_EXISTS, unlike
+ * the similar g_mkdir_with_parents().
+ *
  * For a local #GFile the newly created directories will have the default
  * (current) ownership and permissions of the current process.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
  * Returns: %TRUE if all directories have been successfully created, %FALSE
  * otherwise.
  *
  * Since: 2.18
- **/
+ */
 gboolean
 g_file_make_directory_with_parents (GFile         *file,
-                                   GCancellable  *cancellable,
-                                   GError       **error)
+                                    GCancellable  *cancellable,
+                                    GError       **error)
 {
-  gboolean result;
-  GFile *parent_file, *work_file;
+  GFile *work_file = NULL;
   GList *list = NULL, *l;
   GError *my_error = NULL;
 
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return FALSE;
-  
-  result = g_file_make_directory (file, cancellable, &my_error);
-  if (result || my_error->code != G_IO_ERROR_NOT_FOUND) 
+
+  g_file_make_directory (file, cancellable, &my_error);
+  if (my_error == NULL || my_error->code != G_IO_ERROR_NOT_FOUND)
     {
       if (my_error)
         g_propagate_error (error, my_error);
-      return result;
+      return my_error == NULL;
     }
-  
-  work_file = file;
-  
-  while (!result && my_error->code == G_IO_ERROR_NOT_FOUND) 
+
+  work_file = g_object_ref (file);
+
+  while (my_error != NULL && my_error->code == G_IO_ERROR_NOT_FOUND)
     {
-      g_clear_error (&my_error);
-    
+      GFile *parent_file;
+
       parent_file = g_file_get_parent (work_file);
       if (parent_file == NULL)
         break;
-      result = g_file_make_directory (parent_file, cancellable, &my_error);
-    
-      if (!result && my_error->code == G_IO_ERROR_NOT_FOUND)
-        list = g_list_prepend (list, parent_file);
 
-      work_file = parent_file;
+      g_clear_error (&my_error);
+      g_file_make_directory (parent_file, cancellable, &my_error);
+
+      g_object_unref (work_file);
+      work_file = g_object_ref (parent_file);
+
+      if (my_error != NULL && my_error->code == G_IO_ERROR_NOT_FOUND)
+        list = g_list_prepend (list, parent_file);  /* Transfer ownership of ref */
+      else
+        g_object_unref (parent_file);
     }
 
-  for (l = list; result && l; l = l->next)
+  for (l = list; my_error == NULL && l; l = l->next)
     {
-      result = g_file_make_directory ((GFile *) l->data, cancellable, &my_error);
+      g_file_make_directory ((GFile *) l->data, cancellable, &my_error);
     }
-  
+
+  if (work_file)
+    g_object_unref (work_file);
+
   /* Clean up */
-  while (list != NULL) 
+  while (list != NULL)
     {
       g_object_unref ((GFile *) list->data);
       list = g_list_remove (list, list->data);
     }
 
-  if (!result) 
+  if (my_error != NULL)
     {
       g_propagate_error (error, my_error);
-      return result;
+      return FALSE;
     }
-  
+
   return g_file_make_directory (file, cancellable, error);
 }
 
@@ -3457,8 +3815,9 @@ g_file_make_directory_with_parents (GFile         *file,
  * g_file_make_symbolic_link:
  * @file: a #GFile with the name of the symlink to create
  * @symlink_value: a string with the path for the target of the new symlink
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: a #GError.
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError
  *
  * Creates a symbolic link named @file which contains the string
  * @symlink_value.
@@ -3471,9 +3830,9 @@ g_file_make_directory_with_parents (GFile         *file,
  */
 gboolean
 g_file_make_symbolic_link (GFile         *file,
-                          const char    *symlink_value,
-                          GCancellable  *cancellable,
-                          GError       **error)
+                           const char    *symlink_value,
+                           GCancellable  *cancellable,
+                           GError       **error)
 {
   GFileIface *iface;
 
@@ -3490,7 +3849,7 @@ g_file_make_symbolic_link (GFile         *file,
                            _("Invalid symlink value given"));
       return FALSE;
     }
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->make_symbolic_link == NULL)
@@ -3500,38 +3859,39 @@ g_file_make_symbolic_link (GFile         *file,
                            _("Operation not supported"));
       return FALSE;
     }
-  
+
   return (* iface->make_symbolic_link) (file, symlink_value, cancellable, error);
 }
 
 /**
  * g_file_delete:
- * @file: input #GFile.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: a #GError, or %NULL 
- * 
- * Deletes a file. If the @file is a directory, it will only be deleted if it 
- * is empty.
- * 
+ * @file: input #GFile
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError, or %NULL
+ *
+ * Deletes a file. If the @file is a directory, it will only be
+ * deleted if it is empty. This has the same semantics as g_unlink().
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
  * Virtual: delete_file
  * Returns: %TRUE if the file was deleted. %FALSE otherwise.
- **/
+ */
 gboolean
 g_file_delete (GFile         *file,
-              GCancellable  *cancellable,
-              GError       **error)
+               GCancellable  *cancellable,
+               GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return FALSE;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->delete_file == NULL)
@@ -3541,14 +3901,80 @@ g_file_delete (GFile         *file,
                            _("Operation not supported"));
       return FALSE;
     }
-  
+
   return (* iface->delete_file) (file, cancellable, error);
 }
 
 /**
+ * g_file_delete_async:
+ * @file: input #GFile
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: a #GAsyncReadyCallback to call
+ *     when the request is satisfied
+ * @user_data: the data to pass to callback function
+ *
+ * Asynchronously delete a file. If the @file is a directory, it will
+ * only be deleted if it is empty.  This has the same semantics as
+ * g_unlink().
+ *
+ * Virtual: delete_file_async
+ * Since: 2.34
+ */
+void
+g_file_delete_async (GFile               *file,
+                     int                  io_priority,
+                     GCancellable        *cancellable,
+                     GAsyncReadyCallback  callback,
+                     gpointer             user_data)
+{
+  GFileIface *iface;
+
+  g_return_if_fail (G_IS_FILE (file));
+
+  iface = G_FILE_GET_IFACE (file);
+  (* iface->delete_file_async) (file,
+                                io_priority,
+                                cancellable,
+                                callback,
+                                user_data);
+}
+
+/**
+ * g_file_delete_finish:
+ * @file: input #GFile
+ * @result: a #GAsyncResult
+ * @error: a #GError, or %NULL
+ *
+ * Finishes deleting a file started with g_file_delete_async().
+ *
+ * Virtual: delete_file_finish
+ * Returns: %TRUE if the file was deleted. %FALSE otherwise.
+ * Since: 2.34
+ **/
+gboolean
+g_file_delete_finish (GFile         *file,
+                      GAsyncResult  *result,
+                      GError       **error)
+{
+  GFileIface *iface;
+
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
+
+  if (g_async_result_legacy_propagate_error (result, error))
+    return FALSE;
+
+  iface = G_FILE_GET_IFACE (file);
+  return (* iface->delete_file_finish) (file, result, error);
+}
+
+/**
  * g_file_trash:
- * @file: #GFile to send to trash.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: #GFile to send to trash
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
  *
  * Sends @file to the "Trashcan", if possible. This is similar to
@@ -3556,25 +3982,25 @@ g_file_delete (GFile         *file,
  * Not all file systems support trashing, so this call can return the
  * %G_IO_ERROR_NOT_SUPPORTED error.
  *
- *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * Virtual: trash
  * Returns: %TRUE on successful trash, %FALSE otherwise.
- **/
+ */
 gboolean
 g_file_trash (GFile         *file,
-             GCancellable  *cancellable,
-             GError       **error)
+              GCancellable  *cancellable,
+              GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return FALSE;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->trash == NULL)
@@ -3584,59 +4010,122 @@ g_file_trash (GFile         *file,
                            _("Trash not supported"));
       return FALSE;
     }
-  
+
   return (* iface->trash) (file, cancellable, error);
 }
 
 /**
+ * g_file_trash_async:
+ * @file: input #GFile
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: a #GAsyncReadyCallback to call
+ *     when the request is satisfied
+ * @user_data: the data to pass to callback function
+ *
+ * Asynchronously sends @file to the Trash location, if possible.
+ *
+ * Virtual: trash_async
+ * Since: 2.38
+ */
+void
+g_file_trash_async (GFile               *file,
+                    int                  io_priority,
+                    GCancellable        *cancellable,
+                    GAsyncReadyCallback  callback,
+                    gpointer             user_data)
+{
+  GFileIface *iface;
+
+  g_return_if_fail (G_IS_FILE (file));
+
+  iface = G_FILE_GET_IFACE (file);
+  (* iface->trash_async) (file,
+                          io_priority,
+                          cancellable,
+                          callback,
+                          user_data);
+}
+
+/**
+ * g_file_trash_finish:
+ * @file: input #GFile
+ * @result: a #GAsyncResult
+ * @error: a #GError, or %NULL
+ *
+ * Finishes an asynchronous file trashing operation, started with
+ * g_file_trash_async().
+ *
+ * Virtual: trash_finish
+ * Returns: %TRUE on successful trash, %FALSE otherwise.
+ * Since: 2.38
+ */
+gboolean
+g_file_trash_finish (GFile         *file,
+                     GAsyncResult  *result,
+                     GError       **error)
+{
+  GFileIface *iface;
+
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
+
+  iface = G_FILE_GET_IFACE (file);
+  return (* iface->trash_finish) (file, result, error);
+}
+
+/**
  * g_file_set_display_name:
- * @file: input #GFile.
- * @display_name: a string.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @display_name: a string
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
+ *
  * Renames @file to the specified display name.
  *
- * The display name is converted from UTF8 to the correct encoding for the target
- * filesystem if possible and the @file is renamed to this.
- * 
- * If you want to implement a rename operation in the user interface the edit name
- * (#G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME) should be used as the initial value in the rename
- * widget, and then the result after editing should be passed to g_file_set_display_name().
+ * The display name is converted from UTF-8 to the correct encoding
+ * for the target filesystem if possible and the @file is renamed to this.
+ *
+ * If you want to implement a rename operation in the user interface the
+ * edit name (#G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME) should be used as the
+ * initial value in the rename widget, and then the result after editing
+ * should be passed to g_file_set_display_name().
  *
  * On success the resulting converted filename is returned.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * Returns: (transfer full): a #GFile specifying what @file was renamed to, or %NULL 
- *     if there was an error.
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * Returns: (transfer full): a #GFile specifying what @file was renamed to,
+ *     or %NULL if there was an error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFile *
 g_file_set_display_name (GFile         *file,
-                        const char    *display_name,
-                        GCancellable  *cancellable,
-                        GError       **error)
+                         const gchar   *display_name,
+                         GCancellable  *cancellable,
+                         GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (display_name != NULL, NULL);
 
   if (strchr (display_name, G_DIR_SEPARATOR) != NULL)
     {
       g_set_error (error,
-                  G_IO_ERROR,
-                  G_IO_ERROR_INVALID_ARGUMENT,
-                  _("File names cannot contain '%c'"), G_DIR_SEPARATOR);
+                   G_IO_ERROR,
+                   G_IO_ERROR_INVALID_ARGUMENT,
+                   _("File names cannot contain '%c'"), G_DIR_SEPARATOR);
       return NULL;
     }
-  
+
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   return (* iface->set_display_name) (file, display_name, cancellable, error);
@@ -3644,101 +4133,101 @@ g_file_set_display_name (GFile         *file,
 
 /**
  * g_file_set_display_name_async:
- * @file: input #GFile.
- * @display_name: a string.
- * @io_priority: the <link linkend="io-priority">I/O priority</link> 
- *     of the request. 
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
+ * @file: input #GFile
+ * @display_name: a string
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback to call
+ *     when the request is satisfied
  * @user_data: (closure): the data to pass to callback function
- * 
+ *
  * Asynchronously sets the display name for a given #GFile.
- * 
+ *
  * For more details, see g_file_set_display_name() which is
  * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_set_display_name_finish() to get the result of the operation.
- **/
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_set_display_name_finish() to get
+ * the result of the operation.
+ */
 void
 g_file_set_display_name_async (GFile               *file,
-                              const char          *display_name,
-                              int                  io_priority,
-                              GCancellable        *cancellable,
-                              GAsyncReadyCallback  callback,
-                              gpointer             user_data)
+                               const gchar         *display_name,
+                               gint                 io_priority,
+                               GCancellable        *cancellable,
+                               GAsyncReadyCallback  callback,
+                               gpointer             user_data)
 {
   GFileIface *iface;
-  
+
   g_return_if_fail (G_IS_FILE (file));
   g_return_if_fail (display_name != NULL);
 
   iface = G_FILE_GET_IFACE (file);
   (* iface->set_display_name_async) (file,
-                                    display_name,
-                                    io_priority,
-                                    cancellable,
-                                    callback,
-                                    user_data);
+                                     display_name,
+                                     io_priority,
+                                     cancellable,
+                                     callback,
+                                     user_data);
 }
 
 /**
  * g_file_set_display_name_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult
+ * @file: input #GFile
+ * @res: a #GAsyncResult
  * @error: a #GError, or %NULL
- * 
- * Finishes setting a display name started with 
+ *
+ * Finishes setting a display name started with
  * g_file_set_display_name_async().
- * 
+ *
  * Returns: (transfer full): a #GFile or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFile *
 g_file_set_display_name_finish (GFile         *file,
-                               GAsyncResult  *res,
-                               GError       **error)
+                                GAsyncResult  *res,
+                                GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (res))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return NULL;
-    }
-  
+  if (g_async_result_legacy_propagate_error (res, error))
+    return NULL;
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->set_display_name_finish) (file, res, error);
 }
 
 /**
  * g_file_query_settable_attributes:
- * @file: input #GFile.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
+ *
  * Obtain the list of settable attributes for the file.
  *
- * Returns the type and full attribute name of all the attributes 
- * that can be set on this file. This doesn't mean setting it will always 
- * succeed though, you might get an access failure, or some specific 
- * file may not support a specific attribute.
+ * Returns the type and full attribute name of all the attributes
+ * that can be set on this file. This doesn't mean setting it will
+ * always succeed though, you might get an access failure, or some
+ * specific file may not support a specific attribute.
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
  * Returns: a #GFileAttributeInfoList describing the settable attributes.
- * When you are done with it, release it with g_file_attribute_info_list_unref()
- **/
+ *     When you are done with it, release it with
+ *     g_file_attribute_info_list_unref()
+ */
 GFileAttributeInfoList *
 g_file_query_settable_attributes (GFile         *file,
-                                 GCancellable  *cancellable,
-                                 GError       **error)
+                                  GCancellable  *cancellable,
+                                  GError       **error)
 {
   GFileIface *iface;
   GError *my_error;
@@ -3748,7 +4237,7 @@ g_file_query_settable_attributes (GFile         *file,
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->query_settable_attributes == NULL)
@@ -3756,52 +4245,54 @@ g_file_query_settable_attributes (GFile         *file,
 
   my_error = NULL;
   list = (* iface->query_settable_attributes) (file, cancellable, &my_error);
-  
+
   if (list == NULL)
     {
       if (my_error->domain == G_IO_ERROR && my_error->code == G_IO_ERROR_NOT_SUPPORTED)
-       {
-         list = g_file_attribute_info_list_new ();
-         g_error_free (my_error);
-       }
+        {
+          list = g_file_attribute_info_list_new ();
+          g_error_free (my_error);
+        }
       else
-       g_propagate_error (error, my_error);
+        g_propagate_error (error, my_error);
     }
-  
+
   return list;
 }
 
 /**
  * g_file_query_writable_namespaces:
- * @file: input #GFile.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
- * Obtain the list of attribute namespaces where new attributes 
+ *
+ * Obtain the list of attribute namespaces where new attributes
  * can be created by a user. An example of this is extended
  * attributes (in the "xattr" namespace).
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
  * Returns: a #GFileAttributeInfoList describing the writable namespaces.
- * When you are done with it, release it with g_file_attribute_info_list_unref()
- **/
+ *     When you are done with it, release it with
+ *     g_file_attribute_info_list_unref()
+ */
 GFileAttributeInfoList *
 g_file_query_writable_namespaces (GFile         *file,
-                                 GCancellable  *cancellable,
-                                 GError       **error)
+                                  GCancellable  *cancellable,
+                                  GError       **error)
 {
   GFileIface *iface;
   GError *my_error;
   GFileAttributeInfoList *list;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->query_writable_namespaces == NULL)
@@ -3809,59 +4300,61 @@ g_file_query_writable_namespaces (GFile         *file,
 
   my_error = NULL;
   list = (* iface->query_writable_namespaces) (file, cancellable, &my_error);
-  
+
   if (list == NULL)
     {
       if (my_error->domain == G_IO_ERROR && my_error->code == G_IO_ERROR_NOT_SUPPORTED)
-       {
-         list = g_file_attribute_info_list_new ();
-         g_error_free (my_error);
-       }
+        {
+          list = g_file_attribute_info_list_new ();
+          g_error_free (my_error);
+        }
       else
-       g_propagate_error (error, my_error);
+        g_propagate_error (error, my_error);
     }
-  
+
   return list;
 }
 
 /**
  * g_file_set_attribute:
- * @file: input #GFile.
- * @attribute: a string containing the attribute's name.
+ * @file: input #GFile
+ * @attribute: a string containing the attribute's name
  * @type: The type of the attribute
- * @value_p: (allow-none): a pointer to the value (or the pointer itself if the type is a pointer type)
- * @flags: a set of #GFileQueryInfoFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @value_p: (allow-none): a pointer to the value (or the pointer
+ *     itself if the type is a pointer type)
+ * @flags: a set of #GFileQueryInfoFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
+ *
  * Sets an attribute in the file with attribute name @attribute to @value.
  *
  * Some attributes can be unset by setting @attribute to
  * %G_FILE_ATTRIBUTE_TYPE_INVALID and @value_p to %NULL.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
  * Returns: %TRUE if the attribute was set, %FALSE otherwise.
- **/
+ */
 gboolean
-g_file_set_attribute (GFile                      *file,
-                     const char                 *attribute,
-                     GFileAttributeType          type,
-                     gpointer                    value_p,
-                     GFileQueryInfoFlags         flags,
-                     GCancellable               *cancellable,
-                     GError                    **error)
+g_file_set_attribute (GFile                *file,
+                      const gchar          *attribute,
+                      GFileAttributeType    type,
+                      gpointer              value_p,
+                      GFileQueryInfoFlags   flags,
+                      GCancellable         *cancellable,
+                      GError              **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (attribute != NULL && *attribute != '\0', FALSE);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return FALSE;
-  
+
   iface = G_FILE_GET_IFACE (file);
 
   if (iface->set_attribute == NULL)
@@ -3877,33 +4370,34 @@ g_file_set_attribute (GFile                      *file,
 
 /**
  * g_file_set_attributes_from_info:
- * @file: input #GFile.
- * @info: a #GFileInfo.
+ * @file: input #GFile
+ * @info: a #GFileInfo
  * @flags: #GFileQueryInfoFlags
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: a #GError, or %NULL 
- * 
- * Tries to set all attributes in the #GFileInfo on the target values, 
- * not stopping on the first error.
- * 
- * If there is any error during this operation then @error will be set to
- * the first error. Error on particular fields are flagged by setting 
- * the "status" field in the attribute value to 
- * %G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING, which means you can also detect
- * further errors.
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError, or %NULL
+ *
+ * Tries to set all attributes in the #GFileInfo on the target
+ * values, not stopping on the first error.
+ *
+ * If there is any error during this operation then @error will
+ * be set to the first error. Error on particular fields are flagged
+ * by setting the "status" field in the attribute value to
+ * %G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING, which means you can
+ * also detect further errors.
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * Returns: %TRUE if there was any error, %FALSE otherwise.
- **/
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * Returns: %FALSE if there was any error, %TRUE otherwise.
+ */
 gboolean
 g_file_set_attributes_from_info (GFile                *file,
-                                GFileInfo            *info,
-                                GFileQueryInfoFlags   flags,
-                                GCancellable         *cancellable,
-                                GError              **error)
+                                 GFileInfo            *info,
+                                 GFileQueryInfoFlags   flags,
+                                 GCancellable         *cancellable,
+                                 GError              **error)
 {
   GFileIface *iface;
 
@@ -3912,33 +4406,32 @@ g_file_set_attributes_from_info (GFile                *file,
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return FALSE;
-  
+
   g_file_info_clear_status (info);
-  
+
   iface = G_FILE_GET_IFACE (file);
 
-  return (* iface->set_attributes_from_info) (file, 
-                                              info, 
-                                              flags, 
-                                              cancellable, 
+  return (* iface->set_attributes_from_info) (file,
+                                              info,
+                                              flags,
+                                              cancellable,
                                               error);
 }
 
-
 static gboolean
 g_file_real_set_attributes_from_info (GFile                *file,
-                                     GFileInfo            *info,
-                                     GFileQueryInfoFlags   flags,
-                                     GCancellable         *cancellable,
-                                     GError              **error)
+                                      GFileInfo            *info,
+                                      GFileQueryInfoFlags   flags,
+                                      GCancellable         *cancellable,
+                                      GError              **error)
 {
   char **attributes;
   int i;
   gboolean res;
   GFileAttributeValue *value;
-  
+
   res = TRUE;
-  
+
   attributes = g_file_info_list_attributes (info, NULL);
 
   for (i = 0; attributes[i] != NULL; i++)
@@ -3946,93 +4439,94 @@ g_file_real_set_attributes_from_info (GFile                *file,
       value = _g_file_info_get_attribute_value (info, attributes[i]);
 
       if (value->status != G_FILE_ATTRIBUTE_STATUS_UNSET)
-       continue;
+        continue;
 
       if (!g_file_set_attribute (file, attributes[i],
-                                value->type, _g_file_attribute_value_peek_as_pointer (value),
-                                flags, cancellable, error))
-       {
-         value->status = G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING;
-         res = FALSE;
-         /* Don't set error multiple times */
-         error = NULL;
-       }
+                                 value->type, _g_file_attribute_value_peek_as_pointer (value),
+                                 flags, cancellable, error))
+        {
+          value->status = G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING;
+          res = FALSE;
+          /* Don't set error multiple times */
+          error = NULL;
+        }
       else
-       value->status = G_FILE_ATTRIBUTE_STATUS_SET;
+        value->status = G_FILE_ATTRIBUTE_STATUS_SET;
     }
-  
+
   g_strfreev (attributes);
-  
+
   return res;
 }
 
 /**
  * g_file_set_attributes_async:
- * @file: input #GFile.
- * @info: a #GFileInfo.
- * @flags: a #GFileQueryInfoFlags.
- * @io_priority: the <link linkend="io-priority">I/O priority</link> 
- *     of the request. 
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback
- * @user_data: (closure): a #gpointer.
+ * @file: input #GFile
+ * @info: a #GFileInfo
+ * @flags: a #GFileQueryInfoFlags
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async): a #GAsyncReadyCallback
+ * @user_data: (closure): a #gpointer
  *
  * Asynchronously sets the attributes of @file with @info.
- * 
- * For more details, see g_file_set_attributes_from_info() which is
- * the synchronous version of this call.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_set_attributes_finish() to get the result of the operation.
- **/
+ * For more details, see g_file_set_attributes_from_info(),
+ * which is the synchronous version of this call.
+ *
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_set_attributes_finish() to get
+ * the result of the operation.
+ */
 void
 g_file_set_attributes_async (GFile               *file,
-                            GFileInfo           *info,
-                            GFileQueryInfoFlags  flags,
-                            int                  io_priority,
-                            GCancellable        *cancellable,
-                            GAsyncReadyCallback  callback,
-                            gpointer             user_data)
+                             GFileInfo           *info,
+                             GFileQueryInfoFlags  flags,
+                             int                  io_priority,
+                             GCancellable        *cancellable,
+                             GAsyncReadyCallback  callback,
+                             gpointer             user_data)
 {
   GFileIface *iface;
-  
+
   g_return_if_fail (G_IS_FILE (file));
   g_return_if_fail (G_IS_FILE_INFO (info));
 
   iface = G_FILE_GET_IFACE (file);
-  (* iface->set_attributes_async) (file, 
-                                   info, 
-                                   flags, 
-                                   io_priority, 
-                                   cancellable, 
-                                   callback, 
+  (* iface->set_attributes_async) (file,
+                                   info,
+                                   flags,
+                                   io_priority,
+                                   cancellable,
+                                   callback,
                                    user_data);
 }
 
 /**
  * g_file_set_attributes_finish:
- * @file: input #GFile.
- * @result: a #GAsyncResult.
- * @info: (out) (transfer full): a #GFileInfo.
+ * @file: input #GFile
+ * @result: a #GAsyncResult
+ * @info: (out) (transfer full): a #GFileInfo
  * @error: a #GError, or %NULL
- * 
+ *
  * Finishes setting an attribute started in g_file_set_attributes_async().
- * 
+ *
  * Returns: %TRUE if the attributes were set correctly, %FALSE otherwise.
- **/
+ */
 gboolean
 g_file_set_attributes_finish (GFile         *file,
-                             GAsyncResult  *result,
-                             GFileInfo    **info,
-                             GError       **error)
+                              GAsyncResult  *result,
+                              GFileInfo    **info,
+                              GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
   /* No standard handling of errors here, as we must set info even
-   * on errors 
+   * on errors
    */
   iface = G_FILE_GET_IFACE (file);
   return (* iface->set_attributes_finish) (file, result, info, error);
@@ -4040,222 +4534,232 @@ g_file_set_attributes_finish (GFile         *file,
 
 /**
  * g_file_set_attribute_string:
- * @file: input #GFile.
- * @attribute: a string containing the attribute's name.
- * @value: a string containing the attribute's value.
- * @flags: #GFileQueryInfoFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @attribute: a string containing the attribute's name
+ * @value: a string containing the attribute's value
+ * @flags: #GFileQueryInfoFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
- * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_STRING to @value. 
+ *
+ * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_STRING to @value.
  * If @attribute is of a different type, this operation will fail.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
  * Returns: %TRUE if the @attribute was successfully set, %FALSE otherwise.
- **/
+ */
 gboolean
 g_file_set_attribute_string (GFile                *file,
-                            const char           *attribute,
-                            const char           *value,
-                            GFileQueryInfoFlags   flags,
-                            GCancellable         *cancellable,
-                            GError              **error)
+                             const char           *attribute,
+                             const char           *value,
+                             GFileQueryInfoFlags   flags,
+                             GCancellable         *cancellable,
+                             GError              **error)
 {
   return g_file_set_attribute (file, attribute,
-                              G_FILE_ATTRIBUTE_TYPE_STRING, (gpointer)value,
-                              flags, cancellable, error);
+                               G_FILE_ATTRIBUTE_TYPE_STRING, (gpointer)value,
+                               flags, cancellable, error);
 }
 
 /**
  * g_file_set_attribute_byte_string:
- * @file: input #GFile.
- * @attribute: a string containing the attribute's name.
- * @value: a string containing the attribute's new value.
- * @flags: a #GFileQueryInfoFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @attribute: a string containing the attribute's name
+ * @value: a string containing the attribute's new value
+ * @flags: a #GFileQueryInfoFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
- * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING to @value. 
- * If @attribute is of a different type, this operation will fail, 
- * returning %FALSE. 
- * 
+ *
+ * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING to @value.
+ * If @attribute is of a different type, this operation will fail,
+ * returning %FALSE.
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * Returns: %TRUE if the @attribute was successfully set to @value 
- * in the @file, %FALSE otherwise.
- **/
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * Returns: %TRUE if the @attribute was successfully set to @value
+ *     in the @file, %FALSE otherwise.
+ */
 gboolean
 g_file_set_attribute_byte_string  (GFile                *file,
-                                  const char           *attribute,
-                                  const char           *value,
-                                  GFileQueryInfoFlags   flags,
-                                  GCancellable         *cancellable,
-                                  GError              **error)
+                                   const gchar          *attribute,
+                                   const gchar          *value,
+                                   GFileQueryInfoFlags   flags,
+                                   GCancellable         *cancellable,
+                                   GError              **error)
 {
   return g_file_set_attribute (file, attribute,
-                              G_FILE_ATTRIBUTE_TYPE_BYTE_STRING, (gpointer)value,
-                              flags, cancellable, error);
+                               G_FILE_ATTRIBUTE_TYPE_BYTE_STRING, (gpointer)value,
+                               flags, cancellable, error);
 }
 
 /**
  * g_file_set_attribute_uint32:
- * @file: input #GFile.
- * @attribute: a string containing the attribute's name.
- * @value: a #guint32 containing the attribute's new value.
- * @flags: a #GFileQueryInfoFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @attribute: a string containing the attribute's name
+ * @value: a #guint32 containing the attribute's new value
+ * @flags: a #GFileQueryInfoFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
- * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_UINT32 to @value. 
+ *
+ * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_UINT32 to @value.
  * If @attribute is of a different type, this operation will fail.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * Returns: %TRUE if the @attribute was successfully set to @value 
- * in the @file, %FALSE otherwise.
- **/
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * Returns: %TRUE if the @attribute was successfully set to @value
+ *     in the @file, %FALSE otherwise.
+ */
 gboolean
 g_file_set_attribute_uint32 (GFile                *file,
-                            const char           *attribute,
-                            guint32               value,
-                            GFileQueryInfoFlags   flags,
-                            GCancellable         *cancellable,
-                            GError              **error)
+                             const gchar          *attribute,
+                             guint32               value,
+                             GFileQueryInfoFlags   flags,
+                             GCancellable         *cancellable,
+                             GError              **error)
 {
   return g_file_set_attribute (file, attribute,
-                              G_FILE_ATTRIBUTE_TYPE_UINT32, &value,
-                              flags, cancellable, error);
+                               G_FILE_ATTRIBUTE_TYPE_UINT32, &value,
+                               flags, cancellable, error);
 }
 
 /**
  * g_file_set_attribute_int32:
- * @file: input #GFile.
- * @attribute: a string containing the attribute's name.
- * @value: a #gint32 containing the attribute's new value.
- * @flags: a #GFileQueryInfoFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @attribute: a string containing the attribute's name
+ * @value: a #gint32 containing the attribute's new value
+ * @flags: a #GFileQueryInfoFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
- * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_INT32 to @value. 
+ *
+ * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_INT32 to @value.
  * If @attribute is of a different type, this operation will fail.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * Returns: %TRUE if the @attribute was successfully set to @value 
- * in the @file, %FALSE otherwise. 
- **/
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * Returns: %TRUE if the @attribute was successfully set to @value
+ *     in the @file, %FALSE otherwise.
+ */
 gboolean
 g_file_set_attribute_int32 (GFile                *file,
-                           const char           *attribute,
-                           gint32                value,
-                           GFileQueryInfoFlags   flags,
-                           GCancellable         *cancellable,
-                           GError              **error)
+                            const gchar          *attribute,
+                            gint32                value,
+                            GFileQueryInfoFlags   flags,
+                            GCancellable         *cancellable,
+                            GError              **error)
 {
   return g_file_set_attribute (file, attribute,
-                              G_FILE_ATTRIBUTE_TYPE_INT32, &value,
-                              flags, cancellable, error);
+                               G_FILE_ATTRIBUTE_TYPE_INT32, &value,
+                               flags, cancellable, error);
 }
 
 /**
  * g_file_set_attribute_uint64:
- * @file: input #GFile. 
- * @attribute: a string containing the attribute's name.
- * @value: a #guint64 containing the attribute's new value.
- * @flags: a #GFileQueryInfoFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @attribute: a string containing the attribute's name
+ * @value: a #guint64 containing the attribute's new value
+ * @flags: a #GFileQueryInfoFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
- * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_UINT64 to @value. 
+ *
+ * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_UINT64 to @value.
  * If @attribute is of a different type, this operation will fail.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * Returns: %TRUE if the @attribute was successfully set to @value 
- * in the @file, %FALSE otherwise.
- **/
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * Returns: %TRUE if the @attribute was successfully set to @value
+ *     in the @file, %FALSE otherwise.
+ */
 gboolean
 g_file_set_attribute_uint64 (GFile                *file,
-                            const char           *attribute,
-                            guint64               value,
-                            GFileQueryInfoFlags   flags,
-                            GCancellable         *cancellable,
-                            GError              **error)
+                             const gchar          *attribute,
+                             guint64               value,
+                             GFileQueryInfoFlags   flags,
+                             GCancellable         *cancellable,
+                             GError              **error)
  {
   return g_file_set_attribute (file, attribute,
-                              G_FILE_ATTRIBUTE_TYPE_UINT64, &value,
-                              flags, cancellable, error);
+                               G_FILE_ATTRIBUTE_TYPE_UINT64, &value,
+                               flags, cancellable, error);
 }
 
 /**
  * g_file_set_attribute_int64:
- * @file: input #GFile.
- * @attribute: a string containing the attribute's name.
- * @value: a #guint64 containing the attribute's new value.
- * @flags: a #GFileQueryInfoFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @attribute: a string containing the attribute's name
+ * @value: a #guint64 containing the attribute's new value
+ * @flags: a #GFileQueryInfoFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
- * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_INT64 to @value. 
+ *
+ * Sets @attribute of type %G_FILE_ATTRIBUTE_TYPE_INT64 to @value.
  * If @attribute is of a different type, this operation will fail.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
  * Returns: %TRUE if the @attribute was successfully set, %FALSE otherwise.
- **/
+ */
 gboolean
 g_file_set_attribute_int64 (GFile                *file,
-                           const char           *attribute,
-                           gint64                value,
-                           GFileQueryInfoFlags   flags,
-                           GCancellable         *cancellable,
-                           GError              **error)
+                            const gchar          *attribute,
+                            gint64                value,
+                            GFileQueryInfoFlags   flags,
+                            GCancellable         *cancellable,
+                            GError              **error)
 {
   return g_file_set_attribute (file, attribute,
-                              G_FILE_ATTRIBUTE_TYPE_INT64, &value,
-                              flags, cancellable, error);
+                               G_FILE_ATTRIBUTE_TYPE_INT64, &value,
+                               flags, cancellable, error);
 }
 
 /**
  * g_file_mount_mountable:
- * @file: input #GFile.
+ * @file: input #GFile
  * @flags: flags affecting the operation
- * @mount_operation: a #GMountOperation, or %NULL to avoid user interaction.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @mount_operation: (allow-none): a #GMountOperation,
+ *     or %NULL to avoid user interaction
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call
+ *     when the request is satisfied, or %NULL
  * @user_data: (closure): the data to pass to callback function
- * 
+ *
  * Mounts a file of type G_FILE_TYPE_MOUNTABLE.
- * Using @mount_operation, you can request callbacks when, for instance, 
+ * Using @mount_operation, you can request callbacks when, for instance,
  * passwords are needed during authentication.
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_mount_mountable_finish() to get the result of the operation.
- **/
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_mount_mountable_finish() to get
+ * the result of the operation.
+ */
 void
 g_file_mount_mountable (GFile               *file,
-                       GMountMountFlags     flags,
-                       GMountOperation     *mount_operation,
-                       GCancellable        *cancellable,
-                       GAsyncReadyCallback  callback,
-                       gpointer             user_data)
+                        GMountMountFlags     flags,
+                        GMountOperation     *mount_operation,
+                        GCancellable        *cancellable,
+                        GAsyncReadyCallback  callback,
+                        gpointer             user_data)
 {
   GFileIface *iface;
 
@@ -4263,66 +4767,64 @@ g_file_mount_mountable (GFile               *file,
 
   iface = G_FILE_GET_IFACE (file);
 
-  if (iface->mount_mountable == NULL) 
+  if (iface->mount_mountable == NULL)
     {
-      g_simple_async_report_error_in_idle (G_OBJECT (file),
-                                          callback,
-                                          user_data,
-                                          G_IO_ERROR,
-                                          G_IO_ERROR_NOT_SUPPORTED,
-                                          _("Operation not supported"));
+      g_task_report_new_error (file, callback, user_data,
+                               g_file_mount_mountable,
+                               G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                               _("Operation not supported"));
       return;
     }
-  
+
   (* iface->mount_mountable) (file,
-                             flags,
-                             mount_operation,
-                             cancellable,
-                             callback,
-                             user_data);
+                              flags,
+                              mount_operation,
+                              cancellable,
+                              callback,
+                              user_data);
 }
 
 /**
  * g_file_mount_mountable_finish:
- * @file: input #GFile.
- * @result: a #GAsyncResult.
+ * @file: input #GFile
+ * @result: a #GAsyncResult
  * @error: a #GError, or %NULL
  *
  * Finishes a mount operation. See g_file_mount_mountable() for details.
- * 
- * Finish an asynchronous mount operation that was started 
+ *
+ * Finish an asynchronous mount operation that was started
  * with g_file_mount_mountable().
  *
  * Returns: (transfer full): a #GFile or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
+ */
 GFile *
 g_file_mount_mountable_finish (GFile         *file,
-                              GAsyncResult  *result,
-                              GError       **error)
+                               GAsyncResult  *result,
+                               GError       **error)
 {
   GFileIface *iface;
 
   g_return_val_if_fail (G_IS_FILE (file), NULL);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (result))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return NULL;
-    }
-  
+  if (g_async_result_legacy_propagate_error (result, error))
+    return NULL;
+  else if (g_async_result_is_tagged (result, g_file_mount_mountable))
+    return g_task_propagate_pointer (G_TASK (result), error);
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->mount_mountable_finish) (file, result, error);
 }
 
 /**
  * g_file_unmount_mountable:
- * @file: input #GFile.
+ * @file: input #GFile
  * @flags: flags affecting the operation
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call
+ *     when the request is satisfied, or %NULL
  * @user_data: (closure): the data to pass to callback function
  *
  * Unmounts a file of type G_FILE_TYPE_MOUNTABLE.
@@ -4331,99 +4833,101 @@ g_file_mount_mountable_finish (GFile         *file,
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_unmount_mountable_finish() to get the result of the operation.
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_unmount_mountable_finish() to get
+ * the result of the operation.
  *
  * Deprecated: 2.22: Use g_file_unmount_mountable_with_operation() instead.
- **/
+ */
 void
 g_file_unmount_mountable (GFile               *file,
-                         GMountUnmountFlags   flags,
-                         GCancellable        *cancellable,
-                         GAsyncReadyCallback  callback,
-                         gpointer             user_data)
+                          GMountUnmountFlags   flags,
+                          GCancellable        *cancellable,
+                          GAsyncReadyCallback  callback,
+                          gpointer             user_data)
 {
   GFileIface *iface;
-  
+
   g_return_if_fail (G_IS_FILE (file));
 
   iface = G_FILE_GET_IFACE (file);
-  
+
   if (iface->unmount_mountable == NULL)
     {
-      g_simple_async_report_error_in_idle (G_OBJECT (file),
-                                          callback,
-                                          user_data,
-                                          G_IO_ERROR,
-                                          G_IO_ERROR_NOT_SUPPORTED,
-                                          _("Operation not supported"));
+      g_task_report_new_error (file, callback, user_data,
+                               g_file_unmount_mountable_with_operation,
+                               G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                               _("Operation not supported"));
       return;
     }
-  
+
   (* iface->unmount_mountable) (file,
-                               flags,
-                               cancellable,
-                               callback,
-                               user_data);
+                                flags,
+                                cancellable,
+                                callback,
+                                user_data);
 }
 
 /**
  * g_file_unmount_mountable_finish:
- * @file: input #GFile.
- * @result: a #GAsyncResult.
+ * @file: input #GFile
+ * @result: a #GAsyncResult
  * @error: a #GError, or %NULL
  *
  * Finishes an unmount operation, see g_file_unmount_mountable() for details.
- * 
- * Finish an asynchronous unmount operation that was started 
+ *
+ * Finish an asynchronous unmount operation that was started
  * with g_file_unmount_mountable().
  *
- * Returns: %TRUE if the operation finished successfully. %FALSE
- * otherwise.
+ * Returns: %TRUE if the operation finished successfully.
+ *     %FALSE otherwise.
  *
- * Deprecated: 2.22: Use g_file_unmount_mountable_with_operation_finish() instead.
- **/
+ * Deprecated: 2.22: Use g_file_unmount_mountable_with_operation_finish()
+ *     instead.
+ */
 gboolean
 g_file_unmount_mountable_finish (GFile         *file,
-                                GAsyncResult  *result,
-                                GError       **error)
+                                 GAsyncResult  *result,
+                                 GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (result))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return FALSE;
-    }
-  
+  if (g_async_result_legacy_propagate_error (result, error))
+    return FALSE;
+  else if (g_async_result_is_tagged (result, g_file_unmount_mountable_with_operation))
+    return g_task_propagate_boolean (G_TASK (result), error);
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->unmount_mountable_finish) (file, result, error);
 }
 
 /**
  * g_file_unmount_mountable_with_operation:
- * @file: input #GFile.
+ * @file: input #GFile
  * @flags: flags affecting the operation
- * @mount_operation: a #GMountOperation, or %NULL to avoid user interaction.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @mount_operation: (allow-none): a #GMountOperation,
+ *     or %NULL to avoid user interaction
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call
+ *     when the request is satisfied, or %NULL
  * @user_data: (closure): the data to pass to callback function
  *
- * Unmounts a file of type G_FILE_TYPE_MOUNTABLE.
+ * Unmounts a file of type #G_FILE_TYPE_MOUNTABLE.
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_unmount_mountable_finish() to get the result of the operation.
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_unmount_mountable_finish() to get
+ * the result of the operation.
  *
  * Since: 2.22
- **/
+ */
 void
 g_file_unmount_mountable_with_operation (GFile               *file,
                                          GMountUnmountFlags   flags,
@@ -4440,12 +4944,10 @@ g_file_unmount_mountable_with_operation (GFile               *file,
 
   if (iface->unmount_mountable == NULL && iface->unmount_mountable_with_operation == NULL)
     {
-      g_simple_async_report_error_in_idle (G_OBJECT (file),
-                                          callback,
-                                          user_data,
-                                          G_IO_ERROR,
-                                          G_IO_ERROR_NOT_SUPPORTED,
-                                          _("Operation not supported"));
+      g_task_report_new_error (file, callback, user_data,
+                               g_file_unmount_mountable_with_operation,
+                               G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                               _("Operation not supported"));
       return;
     }
 
@@ -4466,20 +4968,21 @@ g_file_unmount_mountable_with_operation (GFile               *file,
 
 /**
  * g_file_unmount_mountable_with_operation_finish:
- * @file: input #GFile.
- * @result: a #GAsyncResult.
+ * @file: input #GFile
+ * @result: a #GAsyncResult
  * @error: a #GError, or %NULL
  *
- * Finishes an unmount operation, see g_file_unmount_mountable_with_operation() for details.
+ * Finishes an unmount operation,
+ * see g_file_unmount_mountable_with_operation() for details.
  *
  * Finish an asynchronous unmount operation that was started
  * with g_file_unmount_mountable_with_operation().
  *
- * Returns: %TRUE if the operation finished successfully. %FALSE
- * otherwise.
+ * Returns: %TRUE if the operation finished successfully.
+ *     %FALSE otherwise.
  *
  * Since: 2.22
- **/
+ */
 gboolean
 g_file_unmount_mountable_with_operation_finish (GFile         *file,
                                                 GAsyncResult  *result,
@@ -4490,12 +4993,10 @@ g_file_unmount_mountable_with_operation_finish (GFile         *file,
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (result))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return FALSE;
-    }
+  if (g_async_result_legacy_propagate_error (result, error))
+    return FALSE;
+  else if (g_async_result_is_tagged (result, g_file_unmount_mountable_with_operation))
+    return g_task_propagate_boolean (G_TASK (result), error);
 
   iface = G_FILE_GET_IFACE (file);
   if (iface->unmount_mountable_with_operation_finish != NULL)
@@ -4506,96 +5007,98 @@ g_file_unmount_mountable_with_operation_finish (GFile         *file,
 
 /**
  * g_file_eject_mountable:
- * @file: input #GFile.
+ * @file: input #GFile
  * @flags: flags affecting the operation
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call
+ *     when the request is satisfied, or %NULL
  * @user_data: (closure): the data to pass to callback function
- * 
- * Starts an asynchronous eject on a mountable.  
+ *
+ * Starts an asynchronous eject on a mountable.
  * When this operation has completed, @callback will be called with
- * @user_user data, and the operation can be finalized with 
+ * @user_user data, and the operation can be finalized with
  * g_file_eject_mountable_finish().
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
  * Deprecated: 2.22: Use g_file_eject_mountable_with_operation() instead.
- **/
+ */
 void
 g_file_eject_mountable (GFile               *file,
-                       GMountUnmountFlags   flags,
-                       GCancellable        *cancellable,
-                       GAsyncReadyCallback  callback,
-                       gpointer             user_data)
+                        GMountUnmountFlags   flags,
+                        GCancellable        *cancellable,
+                        GAsyncReadyCallback  callback,
+                        gpointer             user_data)
 {
   GFileIface *iface;
 
   g_return_if_fail (G_IS_FILE (file));
 
   iface = G_FILE_GET_IFACE (file);
-  
-  if (iface->eject_mountable == NULL) 
+
+  if (iface->eject_mountable == NULL)
     {
-      g_simple_async_report_error_in_idle (G_OBJECT (file),
-                                          callback,
-                                          user_data,
-                                          G_IO_ERROR,
-                                          G_IO_ERROR_NOT_SUPPORTED,
-                                          _("Operation not supported"));
+      g_task_report_new_error (file, callback, user_data,
+                               g_file_eject_mountable_with_operation,
+                               G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                               _("Operation not supported"));
       return;
     }
-  
+
   (* iface->eject_mountable) (file,
-                             flags,
-                             cancellable,
-                             callback,
-                             user_data);
+                              flags,
+                              cancellable,
+                              callback,
+                              user_data);
 }
 
 /**
  * g_file_eject_mountable_finish:
- * @file: input #GFile.
- * @result: a #GAsyncResult.
+ * @file: input #GFile
+ * @result: a #GAsyncResult
  * @error: a #GError, or %NULL
- * 
- * Finishes an asynchronous eject operation started by 
+ *
+ * Finishes an asynchronous eject operation started by
  * g_file_eject_mountable().
- * 
- * Returns: %TRUE if the @file was ejected successfully. %FALSE 
- * otherwise.
  *
- * Deprecated: 2.22: Use g_file_eject_mountable_with_operation_finish() instead.
- **/
+ * Returns: %TRUE if the @file was ejected successfully.
+ *     %FALSE otherwise.
+ *
+ * Deprecated: 2.22: Use g_file_eject_mountable_with_operation_finish()
+ *     instead.
+ */
 gboolean
 g_file_eject_mountable_finish (GFile         *file,
-                              GAsyncResult  *result,
-                              GError       **error)
+                               GAsyncResult  *result,
+                               GError       **error)
 {
   GFileIface *iface;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (result))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return FALSE;
-    }
-  
+  if (g_async_result_legacy_propagate_error (result, error))
+    return FALSE;
+  else if (g_async_result_is_tagged (result, g_file_eject_mountable_with_operation))
+    return g_task_propagate_boolean (G_TASK (result), error);
+
   iface = G_FILE_GET_IFACE (file);
   return (* iface->eject_mountable_finish) (file, result, error);
 }
 
 /**
  * g_file_eject_mountable_with_operation:
- * @file: input #GFile.
+ * @file: input #GFile
  * @flags: flags affecting the operation
- * @mount_operation: a #GMountOperation, or %NULL to avoid user interaction.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @mount_operation: (allow-none): a #GMountOperation,
+ *     or %NULL to avoid user interaction
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (scope async) (allow-none): a #GAsyncReadyCallback to call
+ *     when the request is satisfied, or %NULL
  * @user_data: (closure): the data to pass to callback function
  *
  * Starts an asynchronous eject on a mountable.
@@ -4608,7 +5111,7 @@ g_file_eject_mountable_finish (GFile         *file,
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
  * Since: 2.22
- **/
+ */
 void
 g_file_eject_mountable_with_operation (GFile               *file,
                                        GMountUnmountFlags   flags,
@@ -4625,12 +5128,10 @@ g_file_eject_mountable_with_operation (GFile               *file,
 
   if (iface->eject_mountable == NULL && iface->eject_mountable_with_operation == NULL)
     {
-      g_simple_async_report_error_in_idle (G_OBJECT (file),
-                                          callback,
-                                          user_data,
-                                          G_IO_ERROR,
-                                          G_IO_ERROR_NOT_SUPPORTED,
-                                          _("Operation not supported"));
+      g_task_report_new_error (file, callback, user_data,
+                               g_file_eject_mountable_with_operation,
+                               G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                               _("Operation not supported"));
       return;
     }
 
@@ -4651,18 +5152,18 @@ g_file_eject_mountable_with_operation (GFile               *file,
 
 /**
  * g_file_eject_mountable_with_operation_finish:
- * @file: input #GFile.
- * @result: a #GAsyncResult.
+ * @file: input #GFile
+ * @result: a #GAsyncResult
  * @error: a #GError, or %NULL
  *
  * Finishes an asynchronous eject operation started by
  * g_file_eject_mountable_with_operation().
  *
- * Returns: %TRUE if the @file was ejected successfully. %FALSE
- * otherwise.
+ * Returns: %TRUE if the @file was ejected successfully.
+ *     %FALSE otherwise.
  *
  * Since: 2.22
- **/
+ */
 gboolean
 g_file_eject_mountable_with_operation_finish (GFile         *file,
                                               GAsyncResult  *result,
@@ -4673,12 +5174,10 @@ g_file_eject_mountable_with_operation_finish (GFile         *file,
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (result))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return FALSE;
-    }
+  if (g_async_result_legacy_propagate_error (result, error))
+    return FALSE;
+  else if (g_async_result_is_tagged (result, g_file_eject_mountable_with_operation))
+    return g_task_propagate_boolean (G_TASK (result), error);
 
   iface = G_FILE_GET_IFACE (file);
   if (iface->eject_mountable_with_operation_finish != NULL)
@@ -4689,31 +5188,40 @@ g_file_eject_mountable_with_operation_finish (GFile         *file,
 
 /**
  * g_file_monitor_directory:
- * @file: input #GFile.
- * @flags: a set of #GFileMonitorFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: a #GError, or %NULL.
- * 
+ * @file: input #GFile
+ * @flags: a set of #GFileMonitorFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError, or %NULL
+ *
  * Obtains a directory monitor for the given file.
  * This may fail if directory monitoring is not supported.
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * It does not make sense for @flags to contain
+ * %G_FILE_MONITOR_WATCH_HARD_LINKS, since hard links can not be made to
+ * directories.  It is not possible to monitor all the files in a
+ * directory for changes made via hard links; if you want to do this then
+ * you must register individual watches with g_file_monitor().
  *
  * Virtual: monitor_dir
- * Returns: (transfer full): a #GFileMonitor for the given @file, or %NULL on error.
+ * Returns: (transfer full): a #GFileMonitor for the given @file,
+ *     or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
-GFileMonitor*
-g_file_monitor_directory (GFile             *file,
-                         GFileMonitorFlags  flags,
-                         GCancellable      *cancellable,
-                         GError           **error)
+ */
+GFileMonitor *
+g_file_monitor_directory (GFile              *file,
+                          GFileMonitorFlags   flags,
+                          GCancellable       *cancellable,
+                          GError            **error)
 {
   GFileIface *iface;
 
   g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (~flags & G_FILE_MONITOR_WATCH_HARD_LINKS, NULL);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
@@ -4733,30 +5241,40 @@ g_file_monitor_directory (GFile             *file,
 
 /**
  * g_file_monitor_file:
- * @file: input #GFile.
- * @flags: a set of #GFileMonitorFlags.
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
- * @error: a #GError, or %NULL.
- * 
+ * @file: input #GFile
+ * @flags: a set of #GFileMonitorFlags
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @error: a #GError, or %NULL
+ *
  * Obtains a file monitor for the given file. If no file notification
  * mechanism exists, then regular polling of the file is used.
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * If @flags contains %G_FILE_MONITOR_WATCH_HARD_LINKS then the monitor
+ * will also attempt to report changes made to the file via another
+ * filename (ie, a hard link). Without this flag, you can only rely on
+ * changes made through the filename contained in @file to be
+ * reported. Using this flag may result in an increase in resource
+ * usage, and may not have any effect depending on the #GFileMonitor
+ * backend and/or filesystem type.
  * 
- * Returns: (transfer full): a #GFileMonitor for the given @file, or %NULL on error.
+ * Returns: (transfer full): a #GFileMonitor for the given @file,
+ *     or %NULL on error.
  *     Free the returned object with g_object_unref().
- **/
-GFileMonitor*
-g_file_monitor_file (GFile             *file,
-                    GFileMonitorFlags  flags,
-                    GCancellable      *cancellable,
-                    GError           **error)
+ */
+GFileMonitor *
+g_file_monitor_file (GFile              *file,
+                     GFileMonitorFlags   flags,
+                     GCancellable       *cancellable,
+                     GError            **error)
 {
   GFileIface *iface;
   GFileMonitor *monitor;
-  
+
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
@@ -4765,11 +5283,11 @@ g_file_monitor_file (GFile             *file,
   iface = G_FILE_GET_IFACE (file);
 
   monitor = NULL;
-  
+
   if (iface->monitor_file)
     monitor = (* iface->monitor_file) (file, flags, cancellable, NULL);
 
-/* Fallback to polling */
+  /* Fallback to polling */
   if (monitor == NULL)
     monitor = _g_poll_file_monitor_new (file);
 
@@ -4780,29 +5298,33 @@ g_file_monitor_file (GFile             *file,
  * g_file_monitor:
  * @file: input #GFile
  * @flags: a set of #GFileMonitorFlags
- * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
  * @error: a #GError, or %NULL
- * 
- * Obtains a file or directory monitor for the given file, depending
- * on the type of the file.
+ *
+ * Obtains a file or directory monitor for the given file,
+ * depending on the type of the file.
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * Returns: (transfer full): a #GFileMonitor for the given @file, or %NULL on error.
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * Returns: (transfer full): a #GFileMonitor for the given @file,
+ *     or %NULL on error.
  *     Free the returned object with g_object_unref().
  *
  * Since: 2.18
  */
-GFileMonitor*
-g_file_monitor (GFile             *file,
-               GFileMonitorFlags  flags,
-               GCancellable      *cancellable,
-               GError           **error)
+GFileMonitor *
+g_file_monitor (GFile              *file,
+                GFileMonitorFlags   flags,
+                GCancellable       *cancellable,
+                GError            **error)
 {
   if (g_file_query_file_type (file, 0, cancellable) == G_FILE_TYPE_DIRECTORY)
-    return g_file_monitor_directory (file, flags, cancellable, error);
+    return g_file_monitor_directory (file,
+                                     flags & ~G_FILE_MONITOR_WATCH_HARD_LINKS,
+                                     cancellable, error);
   else
     return g_file_monitor_file (file, flags, cancellable, error);
 }
@@ -4814,108 +5336,80 @@ g_file_monitor (GFile             *file,
 typedef struct {
   char *attributes;
   GFileQueryInfoFlags flags;
-  GFileInfo *info;
 } QueryInfoAsyncData;
 
 static void
 query_info_data_free (QueryInfoAsyncData *data)
 {
-  if (data->info)
-    g_object_unref (data->info);
   g_free (data->attributes);
   g_free (data);
 }
 
 static void
-query_info_async_thread (GSimpleAsyncResult *res,
-                        GObject            *object,
-                        GCancellable       *cancellable)
+query_info_async_thread (GTask         *task,
+                         gpointer       object,
+                         gpointer       task_data,
+                         GCancellable  *cancellable)
 {
-  GError *error = NULL;
-  QueryInfoAsyncData *data;
+  QueryInfoAsyncData *data = task_data;
   GFileInfo *info;
-  
-  data = g_simple_async_result_get_op_res_gpointer (res);
-  
-  info = g_file_query_info (G_FILE (object), data->attributes, data->flags, cancellable, &error);
+  GError *error = NULL;
 
-  if (info == NULL)
-    g_simple_async_result_take_error (res, error);
+  info = g_file_query_info (G_FILE (object), data->attributes, data->flags, cancellable, &error);
+  if (info)
+    g_task_return_pointer (task, info, g_object_unref);
   else
-    data->info = info;
+    g_task_return_error (task, error);
 }
 
 static void
 g_file_real_query_info_async (GFile               *file,
-                             const char          *attributes,
-                             GFileQueryInfoFlags  flags,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data)
-{
-  GSimpleAsyncResult *res;
+                              const char          *attributes,
+                              GFileQueryInfoFlags  flags,
+                              int                  io_priority,
+                              GCancellable        *cancellable,
+                              GAsyncReadyCallback  callback,
+                              gpointer             user_data)
+{
+  GTask *task;
   QueryInfoAsyncData *data;
 
   data = g_new0 (QueryInfoAsyncData, 1);
   data->attributes = g_strdup (attributes);
   data->flags = flags;
-  
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_query_info_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)query_info_data_free);
-  
-  g_simple_async_result_run_in_thread (res, query_info_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, data, (GDestroyNotify)query_info_data_free);
+  g_task_set_priority (task, io_priority);
+  g_task_run_in_thread (task, query_info_async_thread);
+  g_object_unref (task);
 }
 
 static GFileInfo *
 g_file_real_query_info_finish (GFile         *file,
-                              GAsyncResult  *res,
-                              GError       **error)
+                               GAsyncResult  *res,
+                               GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  QueryInfoAsyncData *data;
-
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_query_info_async);
-
-  data = g_simple_async_result_get_op_res_gpointer (simple);
-  if (data->info)
-    return g_object_ref (data->info);
-  
-  return NULL;
-}
-
-typedef struct {
-  char *attributes;
-  GFileInfo *info;
-} QueryFilesystemInfoAsyncData;
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-static void
-query_filesystem_info_data_free (QueryFilesystemInfoAsyncData *data)
-{
-  if (data->info)
-    g_object_unref (data->info);
-  g_free (data->attributes);
-  g_free (data);
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 static void
-query_filesystem_info_async_thread (GSimpleAsyncResult *res,
-                                    GObject            *object,
-                                    GCancellable       *cancellable)
+query_filesystem_info_async_thread (GTask         *task,
+                                    gpointer       object,
+                                    gpointer       task_data,
+                                    GCancellable  *cancellable)
 {
-  GError *error = NULL;
-  QueryFilesystemInfoAsyncData *data;
+  const char *attributes = task_data;
   GFileInfo *info;
-  
-  data = g_simple_async_result_get_op_res_gpointer (res);
-  
-  info = g_file_query_filesystem_info (G_FILE (object), data->attributes, cancellable, &error);
+  GError *error = NULL;
 
-  if (info == NULL)
-    g_simple_async_result_take_error (res, error);
+  info = g_file_query_filesystem_info (G_FILE (object), attributes, cancellable, &error);
+  if (info)
+    g_task_return_pointer (task, info, g_object_unref);
   else
-    data->info = info;
+    g_task_return_error (task, error);
 }
 
 static void
@@ -4926,17 +5420,13 @@ g_file_real_query_filesystem_info_async (GFile               *file,
                                          GAsyncReadyCallback  callback,
                                          gpointer             user_data)
 {
-  GSimpleAsyncResult *res;
-  QueryFilesystemInfoAsyncData *data;
+  GTask *task;
 
-  data = g_new0 (QueryFilesystemInfoAsyncData, 1);
-  data->attributes = g_strdup (attributes);
-  
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_query_filesystem_info_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)query_filesystem_info_data_free);
-  
-  g_simple_async_result_run_in_thread (res, query_filesystem_info_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, g_strdup (attributes), g_free);
+  g_task_set_priority (task, io_priority);
+  g_task_run_in_thread (task, query_filesystem_info_async_thread);
+  g_object_unref (task);
 }
 
 static GFileInfo *
@@ -4944,272 +5434,198 @@ g_file_real_query_filesystem_info_finish (GFile         *file,
                                           GAsyncResult  *res,
                                           GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  QueryFilesystemInfoAsyncData *data;
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_query_filesystem_info_async);
-
-  data = g_simple_async_result_get_op_res_gpointer (simple);
-  if (data->info)
-    return g_object_ref (data->info);
-  
-  return NULL;
-}
-
-typedef struct {
-  char *attributes;
-  GFileQueryInfoFlags flags;
-  GFileEnumerator *enumerator;
-} EnumerateChildrenAsyncData;
-
-static void
-enumerate_children_data_free (EnumerateChildrenAsyncData *data)
-{
-  if (data->enumerator)
-    g_object_unref (data->enumerator);
-  g_free (data->attributes);
-  g_free (data);
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 static void
-enumerate_children_async_thread (GSimpleAsyncResult *res,
-                                GObject            *object,
-                                GCancellable       *cancellable)
+enumerate_children_async_thread (GTask         *task,
+                                 gpointer       object,
+                                 gpointer       task_data,
+                                 GCancellable  *cancellable)
 {
-  GError *error = NULL;
-  EnumerateChildrenAsyncData *data;
+  QueryInfoAsyncData *data = task_data;
   GFileEnumerator *enumerator;
-  
-  data = g_simple_async_result_get_op_res_gpointer (res);
-  
-  enumerator = g_file_enumerate_children (G_FILE (object), data->attributes, data->flags, cancellable, &error);
+  GError *error = NULL;
 
-  if (enumerator == NULL)
-    g_simple_async_result_take_error (res, error);
+  enumerator = g_file_enumerate_children (G_FILE (object), data->attributes, data->flags, cancellable, &error);
+  if (error)
+    g_task_return_error (task, error);
   else
-    data->enumerator = enumerator;
+    g_task_return_pointer (task, enumerator, g_object_unref);
 }
 
 static void
 g_file_real_enumerate_children_async (GFile               *file,
-                                     const char          *attributes,
-                                     GFileQueryInfoFlags  flags,
-                                     int                  io_priority,
-                                     GCancellable        *cancellable,
-                                     GAsyncReadyCallback  callback,
-                                     gpointer             user_data)
-{
-  GSimpleAsyncResult *res;
-  EnumerateChildrenAsyncData *data;
+                                      const char          *attributes,
+                                      GFileQueryInfoFlags  flags,
+                                      int                  io_priority,
+                                      GCancellable        *cancellable,
+                                      GAsyncReadyCallback  callback,
+                                      gpointer             user_data)
+{
+  GTask *task;
+  QueryInfoAsyncData *data;
 
-  data = g_new0 (EnumerateChildrenAsyncData, 1);
+  data = g_new0 (QueryInfoAsyncData, 1);
   data->attributes = g_strdup (attributes);
   data->flags = flags;
-  
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_enumerate_children_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)enumerate_children_data_free);
-  
-  g_simple_async_result_run_in_thread (res, enumerate_children_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, data, (GDestroyNotify)query_info_data_free);
+  g_task_set_priority (task, io_priority);
+  g_task_run_in_thread (task, enumerate_children_async_thread);
+  g_object_unref (task);
 }
 
 static GFileEnumerator *
 g_file_real_enumerate_children_finish (GFile         *file,
-                                      GAsyncResult  *res,
-                                      GError       **error)
+                                       GAsyncResult  *res,
+                                       GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  EnumerateChildrenAsyncData *data;
-
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_enumerate_children_async);
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-  data = g_simple_async_result_get_op_res_gpointer (simple);
-  if (data->enumerator)
-    return g_object_ref (data->enumerator);
-  
-  return NULL;
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 static void
-open_read_async_thread (GSimpleAsyncResult *res,
-                       GObject            *object,
-                       GCancellable       *cancellable)
+open_read_async_thread (GTask         *task,
+                        gpointer       object,
+                        gpointer       task_data,
+                        GCancellable  *cancellable)
 {
-  GFileIface *iface;
   GFileInputStream *stream;
   GError *error = NULL;
 
-  iface = G_FILE_GET_IFACE (object);
-
-  if (iface->read_fn == NULL)
-    {
-      g_set_error_literal (&error, G_IO_ERROR,
-                           G_IO_ERROR_NOT_SUPPORTED,
-                           _("Operation not supported"));
-
-      g_simple_async_result_take_error (res, error);
-
-      return;
-    }
-  
-  stream = iface->read_fn (G_FILE (object), cancellable, &error);
-
-  if (stream == NULL)
-    g_simple_async_result_take_error (res, error);
+  stream = g_file_read (G_FILE (object), cancellable, &error);
+  if (stream)
+    g_task_return_pointer (task, stream, g_object_unref);
   else
-    g_simple_async_result_set_op_res_gpointer (res, stream, g_object_unref);
+    g_task_return_error (task, error);
 }
 
 static void
 g_file_real_read_async (GFile               *file,
-                       int                  io_priority,
-                       GCancellable        *cancellable,
-                       GAsyncReadyCallback  callback,
-                       gpointer             user_data)
+                        int                  io_priority,
+                        GCancellable        *cancellable,
+                        GAsyncReadyCallback  callback,
+                        gpointer             user_data)
 {
-  GSimpleAsyncResult *res;
-  
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_read_async);
-  
-  g_simple_async_result_run_in_thread (res, open_read_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+  GTask *task;
+
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_priority (task, io_priority);
+  g_task_run_in_thread (task, open_read_async_thread);
+  g_object_unref (task);
 }
 
 static GFileInputStream *
 g_file_real_read_finish (GFile         *file,
-                        GAsyncResult  *res,
-                        GError       **error)
+                         GAsyncResult  *res,
+                         GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  gpointer op;
-
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_read_async);
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-  op = g_simple_async_result_get_op_res_gpointer (simple);
-  if (op)
-    return g_object_ref (op);
-  
-  return NULL;
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 static void
-append_to_async_thread (GSimpleAsyncResult *res,
-                       GObject            *object,
-                       GCancellable       *cancellable)
+append_to_async_thread (GTask         *task,
+                        gpointer       source_object,
+                        gpointer       task_data,
+                        GCancellable  *cancellable)
 {
-  GFileIface *iface;
-  GFileCreateFlags *data;
+  GFileCreateFlags *data = task_data;
   GFileOutputStream *stream;
   GError *error = NULL;
 
-  iface = G_FILE_GET_IFACE (object);
-
-  data = g_simple_async_result_get_op_res_gpointer (res);
-
-  stream = iface->append_to (G_FILE (object), *data, cancellable, &error);
-
-  if (stream == NULL)
-    g_simple_async_result_take_error (res, error);
+  stream = g_file_append_to (G_FILE (source_object), *data, cancellable, &error);
+  if (stream)
+    g_task_return_pointer (task, stream, g_object_unref);
   else
-    g_simple_async_result_set_op_res_gpointer (res, stream, g_object_unref);
+    g_task_return_error (task, error);
 }
 
 static void
 g_file_real_append_to_async (GFile               *file,
-                            GFileCreateFlags     flags,
-                            int                  io_priority,
-                            GCancellable        *cancellable,
-                            GAsyncReadyCallback  callback,
-                            gpointer             user_data)
+                             GFileCreateFlags     flags,
+                             int                  io_priority,
+                             GCancellable        *cancellable,
+                             GAsyncReadyCallback  callback,
+                             gpointer             user_data)
 {
   GFileCreateFlags *data;
-  GSimpleAsyncResult *res;
+  GTask *task;
 
   data = g_new0 (GFileCreateFlags, 1);
   *data = flags;
 
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_append_to_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)g_free);
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, data, g_free);
+  g_task_set_priority (task, io_priority);
 
-  g_simple_async_result_run_in_thread (res, append_to_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+  g_task_run_in_thread (task, append_to_async_thread);
+  g_object_unref (task);
 }
 
 static GFileOutputStream *
 g_file_real_append_to_finish (GFile         *file,
-                             GAsyncResult  *res,
-                             GError       **error)
+                              GAsyncResult  *res,
+                              GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  gpointer op;
-
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_append_to_async);
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-  op = g_simple_async_result_get_op_res_gpointer (simple);
-  if (op)
-    return g_object_ref (op);
-  
-  return NULL;
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 static void
-create_async_thread (GSimpleAsyncResult *res,
-                    GObject            *object,
-                    GCancellable       *cancellable)
+create_async_thread (GTask         *task,
+                     gpointer       source_object,
+                     gpointer       task_data,
+                     GCancellable  *cancellable)
 {
-  GFileIface *iface;
-  GFileCreateFlags *data;
+  GFileCreateFlags *data = task_data;
   GFileOutputStream *stream;
   GError *error = NULL;
 
-  iface = G_FILE_GET_IFACE (object);
-
-  data = g_simple_async_result_get_op_res_gpointer (res);
-
-  stream = iface->create (G_FILE (object), *data, cancellable, &error);
-
-  if (stream == NULL)
-    g_simple_async_result_take_error (res, error);
+  stream = g_file_create (G_FILE (source_object), *data, cancellable, &error);
+  if (stream)
+    g_task_return_pointer (task, stream, g_object_unref);
   else
-    g_simple_async_result_set_op_res_gpointer (res, stream, g_object_unref);
+    g_task_return_error (task, error);
 }
 
 static void
 g_file_real_create_async (GFile               *file,
-                         GFileCreateFlags     flags,
-                         int                  io_priority,
-                         GCancellable        *cancellable,
-                         GAsyncReadyCallback  callback,
-                         gpointer             user_data)
+                          GFileCreateFlags     flags,
+                          int                  io_priority,
+                          GCancellable        *cancellable,
+                          GAsyncReadyCallback  callback,
+                          gpointer             user_data)
 {
   GFileCreateFlags *data;
-  GSimpleAsyncResult *res;
+  GTask *task;
 
   data = g_new0 (GFileCreateFlags, 1);
   *data = flags;
 
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_create_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)g_free);
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, data, g_free);
+  g_task_set_priority (task, io_priority);
 
-  g_simple_async_result_run_in_thread (res, create_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+  g_task_run_in_thread (task, create_async_thread);
+  g_object_unref (task);
 }
 
 static GFileOutputStream *
 g_file_real_create_finish (GFile         *file,
-                          GAsyncResult  *res,
-                          GError       **error)
+                           GAsyncResult  *res,
+                           GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  gpointer op;
-
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_create_async);
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-  op = g_simple_async_result_get_op_res_gpointer (simple);
-  if (op)
-    return g_object_ref (op);
-  
-  return NULL;
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 typedef struct {
@@ -5229,43 +5645,39 @@ replace_async_data_free (ReplaceAsyncData *data)
 }
 
 static void
-replace_async_thread (GSimpleAsyncResult *res,
-                     GObject            *object,
-                     GCancellable       *cancellable)
+replace_async_thread (GTask         *task,
+                      gpointer       source_object,
+                      gpointer       task_data,
+                      GCancellable  *cancellable)
 {
-  GFileIface *iface;
   GFileOutputStream *stream;
+  ReplaceAsyncData *data = task_data;
   GError *error = NULL;
-  ReplaceAsyncData *data;
 
-  iface = G_FILE_GET_IFACE (object);
-  
-  data = g_simple_async_result_get_op_res_gpointer (res);
-
-  stream = iface->replace (G_FILE (object),
-                          data->etag,
-                          data->make_backup,
-                          data->flags,
-                          cancellable,
-                          &error);
+  stream = g_file_replace (G_FILE (source_object),
+                           data->etag,
+                           data->make_backup,
+                           data->flags,
+                           cancellable,
+                           &error);
 
-  if (stream == NULL)
-    g_simple_async_result_take_error (res, error);
+  if (stream)
+    g_task_return_pointer (task, stream, g_object_unref);
   else
-    data->stream = stream;
+    g_task_return_error (task, error);
 }
 
 static void
 g_file_real_replace_async (GFile               *file,
-                          const char          *etag,
-                          gboolean             make_backup,
-                          GFileCreateFlags     flags,
-                          int                  io_priority,
-                          GCancellable        *cancellable,
-                          GAsyncReadyCallback  callback,
-                          gpointer             user_data)
-{
-  GSimpleAsyncResult *res;
+                           const char          *etag,
+                           gboolean             make_backup,
+                           GFileCreateFlags     flags,
+                           int                  io_priority,
+                           GCancellable        *cancellable,
+                           GAsyncReadyCallback  callback,
+                           gpointer             user_data)
+{
+  GTask *task;
   ReplaceAsyncData *data;
 
   data = g_new0 (ReplaceAsyncData, 1);
@@ -5273,144 +5685,222 @@ g_file_real_replace_async (GFile               *file,
   data->make_backup = make_backup;
   data->flags = flags;
 
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_replace_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)replace_async_data_free);
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, data, (GDestroyNotify)replace_async_data_free);
+  g_task_set_priority (task, io_priority);
+
+  g_task_run_in_thread (task, replace_async_thread);
+  g_object_unref (task);
+}
+
+static GFileOutputStream *
+g_file_real_replace_finish (GFile         *file,
+                            GAsyncResult  *res,
+                            GError       **error)
+{
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
+
+  return g_task_propagate_pointer (G_TASK (res), error);
+}
+
+static void
+delete_async_thread (GTask        *task,
+                     gpointer      object,
+                     gpointer      task_data,
+                     GCancellable *cancellable)
+{
+  GError *error = NULL;
+
+  if (g_file_delete (G_FILE (object), cancellable, &error))
+    g_task_return_boolean (task, TRUE);
+  else
+    g_task_return_error (task, error);
+}
+
+static void
+g_file_real_delete_async (GFile               *file,
+                          int                  io_priority,
+                          GCancellable        *cancellable,
+                          GAsyncReadyCallback  callback,
+                          gpointer             user_data)
+{
+  GTask *task;
+
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_priority (task, io_priority);
+  g_task_run_in_thread (task, delete_async_thread);
+  g_object_unref (task);
+}
+
+static gboolean
+g_file_real_delete_finish (GFile         *file,
+                           GAsyncResult  *res,
+                           GError       **error)
+{
+  g_return_val_if_fail (g_task_is_valid (res, file), FALSE);
+
+  return g_task_propagate_boolean (G_TASK (res), error);
+}
+
+static void
+trash_async_thread (GTask        *task,
+                    gpointer      object,
+                    gpointer      task_data,
+                    GCancellable *cancellable)
+{
+  GError *error = NULL;
+
+  if (g_file_trash (G_FILE (object), cancellable, &error))
+    g_task_return_boolean (task, TRUE);
+  else
+    g_task_return_error (task, error);
+}
+
+static void
+g_file_real_trash_async (GFile               *file,
+                         int                  io_priority,
+                         GCancellable        *cancellable,
+                         GAsyncReadyCallback  callback,
+                         gpointer             user_data)
+{
+  GTask *task;
+
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_priority (task, io_priority);
+  g_task_run_in_thread (task, trash_async_thread);
+  g_object_unref (task);
+}
+
+static gboolean
+g_file_real_trash_finish (GFile         *file,
+                          GAsyncResult  *res,
+                          GError       **error)
+{
+  g_return_val_if_fail (g_task_is_valid (res, file), FALSE);
+
+  return g_task_propagate_boolean (G_TASK (res), error);
+}
+
+static void
+make_directory_async_thread (GTask        *task,
+                             gpointer      object,
+                             gpointer      task_data,
+                             GCancellable *cancellable)
+{
+  GError *error = NULL;
+
+  if (g_file_make_directory (G_FILE (object), cancellable, &error))
+    g_task_return_boolean (task, TRUE);
+  else
+    g_task_return_error (task, error);
+}
+
+static void
+g_file_real_make_directory_async (GFile               *file,
+                                  int                  io_priority,
+                                  GCancellable        *cancellable,
+                                  GAsyncReadyCallback  callback,
+                                  gpointer             user_data)
+{
+  GTask *task;
 
-  g_simple_async_result_run_in_thread (res, replace_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_priority (task, io_priority);
+  g_task_run_in_thread (task, make_directory_async_thread);
+  g_object_unref (task);
 }
 
-static GFileOutputStream *
-g_file_real_replace_finish (GFile         *file,
-                           GAsyncResult  *res,
-                           GError       **error)
+static gboolean
+g_file_real_make_directory_finish (GFile         *file,
+                                   GAsyncResult  *res,
+                                   GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  ReplaceAsyncData *data;
+  g_return_val_if_fail (g_task_is_valid (res, file), FALSE);
 
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_replace_async);
-
-  data = g_simple_async_result_get_op_res_gpointer (simple);
-  if (data->stream)
-    return g_object_ref (data->stream);
-  
-  return NULL;
+  return g_task_propagate_boolean (G_TASK (res), error);
 }
 
 static void
-open_readwrite_async_thread (GSimpleAsyncResult *res,
-                            GObject            *object,
-                            GCancellable       *cancellable)
+open_readwrite_async_thread (GTask        *task,
+                             gpointer      object,
+                             gpointer      task_data,
+                             GCancellable *cancellable)
 {
-  GFileIface *iface;
   GFileIOStream *stream;
   GError *error = NULL;
 
-  iface = G_FILE_GET_IFACE (object);
-
-  if (iface->open_readwrite == NULL)
-    {
-      g_set_error_literal (&error, G_IO_ERROR,
-                           G_IO_ERROR_NOT_SUPPORTED,
-                           _("Operation not supported"));
-
-      g_simple_async_result_take_error (res, error);
-
-      return;
-    }
-
-  stream = iface->open_readwrite (G_FILE (object), cancellable, &error);
+  stream = g_file_open_readwrite (G_FILE (object), cancellable, &error);
 
   if (stream == NULL)
-    g_simple_async_result_take_error (res, error);
+    g_task_return_error (task, error);
   else
-    g_simple_async_result_set_op_res_gpointer (res, stream, g_object_unref);
+    g_task_return_pointer (task, stream, g_object_unref);
 }
 
 static void
 g_file_real_open_readwrite_async (GFile               *file,
-                                 int                  io_priority,
-                                 GCancellable        *cancellable,
-                                 GAsyncReadyCallback  callback,
-                                 gpointer             user_data)
+                                  int                  io_priority,
+                                  GCancellable        *cancellable,
+                                  GAsyncReadyCallback  callback,
+                                  gpointer             user_data)
 {
-  GSimpleAsyncResult *res;
+  GTask *task;
 
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_open_readwrite_async);
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_priority (task, io_priority);
 
-  g_simple_async_result_run_in_thread (res, open_readwrite_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+  g_task_run_in_thread (task, open_readwrite_async_thread);
+  g_object_unref (task);
 }
 
 static GFileIOStream *
 g_file_real_open_readwrite_finish (GFile         *file,
-                                  GAsyncResult  *res,
-                                  GError       **error)
+                                   GAsyncResult  *res,
+                                   GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  gpointer op;
-
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_open_readwrite_async);
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-  op = g_simple_async_result_get_op_res_gpointer (simple);
-  if (op)
-    return g_object_ref (op);
-
-  return NULL;
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 static void
-create_readwrite_async_thread (GSimpleAsyncResult *res,
-                              GObject            *object,
-                              GCancellable       *cancellable)
+create_readwrite_async_thread (GTask        *task,
+                               gpointer      object,
+                               gpointer      task_data,
+                               GCancellable *cancellable)
 {
-  GFileIface *iface;
-  GFileCreateFlags *data;
+  GFileCreateFlags *data = task_data;
   GFileIOStream *stream;
   GError *error = NULL;
 
-  iface = G_FILE_GET_IFACE (object);
-
-  data = g_simple_async_result_get_op_res_gpointer (res);
-
-  if (iface->create_readwrite == NULL)
-    {
-      g_set_error_literal (&error, G_IO_ERROR,
-                           G_IO_ERROR_NOT_SUPPORTED,
-                           _("Operation not supported"));
-
-      g_simple_async_result_take_error (res, error);
-
-      return;
-    }
-
-  stream = iface->create_readwrite (G_FILE (object), *data, cancellable, &error);
+  stream = g_file_create_readwrite (G_FILE (object), *data, cancellable, &error);
 
   if (stream == NULL)
-    g_simple_async_result_take_error (res, error);
+    g_task_return_error (task, error);
   else
-    g_simple_async_result_set_op_res_gpointer (res, stream, g_object_unref);
+    g_task_return_pointer (task, stream, g_object_unref);
 }
 
 static void
 g_file_real_create_readwrite_async (GFile               *file,
-                                   GFileCreateFlags     flags,
-                                   int                  io_priority,
-                                   GCancellable        *cancellable,
-                                   GAsyncReadyCallback  callback,
-                                   gpointer             user_data)
+                                    GFileCreateFlags     flags,
+                                    int                  io_priority,
+                                    GCancellable        *cancellable,
+                                    GAsyncReadyCallback  callback,
+                                    gpointer             user_data)
 {
   GFileCreateFlags *data;
-  GSimpleAsyncResult *res;
+  GTask *task;
 
   data = g_new0 (GFileCreateFlags, 1);
   *data = flags;
 
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_create_readwrite_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)g_free);
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, data, g_free);
+  g_task_set_priority (task, io_priority);
 
-  g_simple_async_result_run_in_thread (res, create_readwrite_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+  g_task_run_in_thread (task, create_readwrite_async_thread);
+  g_object_unref (task);
 }
 
 static GFileIOStream *
@@ -5418,20 +5908,12 @@ g_file_real_create_readwrite_finish (GFile         *file,
                                      GAsyncResult  *res,
                                      GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  gpointer op;
-
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_create_readwrite_async);
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-  op = g_simple_async_result_get_op_res_gpointer (simple);
-  if (op)
-    return g_object_ref (op);
-
-  return NULL;
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 typedef struct {
-  GFileIOStream *stream;
   char *etag;
   gboolean make_backup;
   GFileCreateFlags flags;
@@ -5440,50 +5922,44 @@ typedef struct {
 static void
 replace_rw_async_data_free (ReplaceRWAsyncData *data)
 {
-  if (data->stream)
-    g_object_unref (data->stream);
   g_free (data->etag);
   g_free (data);
 }
 
 static void
-replace_readwrite_async_thread (GSimpleAsyncResult *res,
-                               GObject            *object,
-                               GCancellable       *cancellable)
+replace_readwrite_async_thread (GTask        *task,
+                                gpointer      object,
+                                gpointer      task_data,
+                                GCancellable *cancellable)
 {
-  GFileIface *iface;
   GFileIOStream *stream;
   GError *error = NULL;
-  ReplaceRWAsyncData *data;
-
-  iface = G_FILE_GET_IFACE (object);
+  ReplaceRWAsyncData *data = task_data;
 
-  data = g_simple_async_result_get_op_res_gpointer (res);
-
-  stream = iface->replace_readwrite (G_FILE (object),
-                                    data->etag,
-                                    data->make_backup,
-                                    data->flags,
-                                    cancellable,
-                                    &error);
+  stream = g_file_replace_readwrite (G_FILE (object),
+                                     data->etag,
+                                     data->make_backup,
+                                     data->flags,
+                                     cancellable,
+                                     &error);
 
   if (stream == NULL)
-    g_simple_async_result_take_error (res, error);
+    g_task_return_error (task, error);
   else
-    data->stream = stream;
+    g_task_return_pointer (task, stream, g_object_unref);
 }
 
 static void
 g_file_real_replace_readwrite_async (GFile               *file,
-                                    const char          *etag,
-                                    gboolean             make_backup,
-                                    GFileCreateFlags     flags,
-                                    int                  io_priority,
-                                    GCancellable        *cancellable,
-                                    GAsyncReadyCallback  callback,
-                                    gpointer             user_data)
-{
-  GSimpleAsyncResult *res;
+                                     const char          *etag,
+                                     gboolean             make_backup,
+                                     GFileCreateFlags     flags,
+                                     int                  io_priority,
+                                     GCancellable        *cancellable,
+                                     GAsyncReadyCallback  callback,
+                                     gpointer             user_data)
+{
+  GTask *task;
   ReplaceRWAsyncData *data;
 
   data = g_new0 (ReplaceRWAsyncData, 1);
@@ -5491,11 +5967,12 @@ g_file_real_replace_readwrite_async (GFile               *file,
   data->make_backup = make_backup;
   data->flags = flags;
 
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_replace_readwrite_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)replace_rw_async_data_free);
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, data, (GDestroyNotify)replace_rw_async_data_free);
+  g_task_set_priority (task, io_priority);
 
-  g_simple_async_result_run_in_thread (res, replace_readwrite_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+  g_task_run_in_thread (task, replace_readwrite_async_thread);
+  g_object_unref (task);
 }
 
 static GFileIOStream *
@@ -5503,87 +5980,55 @@ g_file_real_replace_readwrite_finish (GFile         *file,
                                       GAsyncResult  *res,
                                       GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  ReplaceRWAsyncData *data;
-
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_replace_readwrite_async);
-
-  data = g_simple_async_result_get_op_res_gpointer (simple);
-  if (data->stream)
-    return g_object_ref (data->stream);
-
-  return NULL;
-}
-
-typedef struct {
-  char *name;
-  GFile *file;
-} SetDisplayNameAsyncData;
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-static void
-set_display_name_data_free (SetDisplayNameAsyncData *data)
-{
-  g_free (data->name);
-  if (data->file)
-    g_object_unref (data->file);
-  g_free (data);
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 static void
-set_display_name_async_thread (GSimpleAsyncResult *res,
-                              GObject            *object,
-                              GCancellable       *cancellable)
+set_display_name_async_thread (GTask        *task,
+                               gpointer      object,
+                               gpointer      task_data,
+                               GCancellable *cancellable)
 {
   GError *error = NULL;
-  SetDisplayNameAsyncData *data;
+  char *name = task_data;
   GFile *file;
-  
-  data = g_simple_async_result_get_op_res_gpointer (res);
-  
-  file = g_file_set_display_name (G_FILE (object), data->name, cancellable, &error);
+
+  file = g_file_set_display_name (G_FILE (object), name, cancellable, &error);
 
   if (file == NULL)
-    g_simple_async_result_take_error (res, error);
+    g_task_return_error (task, error);
   else
-    data->file = file;
+    g_task_return_pointer (task, file, g_object_unref);
 }
 
 static void
-g_file_real_set_display_name_async (GFile               *file, 
-                                   const char          *display_name,
-                                   int                  io_priority,
-                                   GCancellable        *cancellable,
-                                   GAsyncReadyCallback  callback,
-                                   gpointer             user_data)
-{
-  GSimpleAsyncResult *res;
-  SetDisplayNameAsyncData *data;
-
-  data = g_new0 (SetDisplayNameAsyncData, 1);
-  data->name = g_strdup (display_name);
-  
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_set_display_name_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)set_display_name_data_free);
-  
-  g_simple_async_result_run_in_thread (res, set_display_name_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+g_file_real_set_display_name_async (GFile               *file,
+                                    const char          *display_name,
+                                    int                  io_priority,
+                                    GCancellable        *cancellable,
+                                    GAsyncReadyCallback  callback,
+                                    gpointer             user_data)
+{
+  GTask *task;
+
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, g_strdup (display_name), g_free);
+  g_task_set_priority (task, io_priority);
+
+  g_task_run_in_thread (task, set_display_name_async_thread);
+  g_object_unref (task);
 }
 
 static GFile *
 g_file_real_set_display_name_finish (GFile         *file,
-                                    GAsyncResult  *res,
-                                    GError       **error)
+                                     GAsyncResult  *res,
+                                     GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  SetDisplayNameAsyncData *data;
-
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_set_display_name_async);
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-  data = g_simple_async_result_get_op_res_gpointer (simple);
-  if (data->file)
-    return g_object_ref (data->file);
-  
-  return NULL;
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 typedef struct {
@@ -5604,110 +6049,107 @@ set_info_data_free (SetInfoAsyncData *data)
 }
 
 static void
-set_info_async_thread (GSimpleAsyncResult *res,
-                      GObject            *object,
-                      GCancellable       *cancellable)
+set_info_async_thread (GTask        *task,
+                       gpointer      object,
+                       gpointer      task_data,
+                       GCancellable *cancellable)
 {
-  SetInfoAsyncData *data;
-  
-  data = g_simple_async_result_get_op_res_gpointer (res);
-  
+  SetInfoAsyncData *data = task_data;
+
   data->error = NULL;
   data->res = g_file_set_attributes_from_info (G_FILE (object),
-                                              data->info,
-                                              data->flags,
-                                              cancellable,
-                                              &data->error);
+                                               data->info,
+                                               data->flags,
+                                               cancellable,
+                                               &data->error);
 }
 
 static void
 g_file_real_set_attributes_async (GFile               *file,
-                                 GFileInfo           *info,
-                                 GFileQueryInfoFlags  flags,
-                                 int                  io_priority,
-                                 GCancellable        *cancellable,
-                                 GAsyncReadyCallback  callback,
-                                 gpointer             user_data)
-{
-  GSimpleAsyncResult *res;
+                                  GFileInfo           *info,
+                                  GFileQueryInfoFlags  flags,
+                                  int                  io_priority,
+                                  GCancellable        *cancellable,
+                                  GAsyncReadyCallback  callback,
+                                  gpointer             user_data)
+{
+  GTask *task;
   SetInfoAsyncData *data;
 
   data = g_new0 (SetInfoAsyncData, 1);
   data->info = g_file_info_dup (info);
   data->flags = flags;
-  
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_set_attributes_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)set_info_data_free);
-  
-  g_simple_async_result_run_in_thread (res, set_info_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, data, (GDestroyNotify)set_info_data_free);
+  g_task_set_priority (task, io_priority);
+
+  g_task_run_in_thread (task, set_info_async_thread);
+  g_object_unref (task);
 }
 
 static gboolean
 g_file_real_set_attributes_finish (GFile         *file,
-                                  GAsyncResult  *res,
-                                  GFileInfo    **info,
-                                  GError       **error)
+                                   GAsyncResult  *res,
+                                   GFileInfo    **info,
+                                   GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
   SetInfoAsyncData *data;
-  
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_set_attributes_async);
 
-  data = g_simple_async_result_get_op_res_gpointer (simple);
+  g_return_val_if_fail (g_task_is_valid (res, file), FALSE);
 
-  if (info) 
+  data = g_task_get_task_data (G_TASK (res));
+
+  if (info)
     *info = g_object_ref (data->info);
 
-  if (error != NULL && data->error) 
+  if (error != NULL && data->error)
     *error = g_error_copy (data->error);
-  
+
   return data->res;
 }
 
 static void
-find_enclosing_mount_async_thread (GSimpleAsyncResult *res,
-                                   GObject            *object,
-                                   GCancellable       *cancellable)
+find_enclosing_mount_async_thread (GTask        *task,
+                                   gpointer      object,
+                                   gpointer      task_data,
+                                   GCancellable *cancellable)
 {
   GError *error = NULL;
   GMount *mount;
-  
+
   mount = g_file_find_enclosing_mount (G_FILE (object), cancellable, &error);
 
   if (mount == NULL)
-    g_simple_async_result_take_error (res, error);
+    g_task_return_error (task, error);
   else
-    g_simple_async_result_set_op_res_gpointer (res, mount, (GDestroyNotify)g_object_unref);
+    g_task_return_pointer (task, mount, g_object_unref);
 }
 
 static void
 g_file_real_find_enclosing_mount_async (GFile               *file,
-                                       int                  io_priority,
-                                       GCancellable        *cancellable,
-                                       GAsyncReadyCallback  callback,
-                                       gpointer             user_data)
+                                        int                  io_priority,
+                                        GCancellable        *cancellable,
+                                        GAsyncReadyCallback  callback,
+                                        gpointer             user_data)
 {
-  GSimpleAsyncResult *res;
-  
-  res = g_simple_async_result_new (G_OBJECT (file), callback, user_data, g_file_real_find_enclosing_mount_async);
-  
-  g_simple_async_result_run_in_thread (res, find_enclosing_mount_async_thread, io_priority, cancellable);
-  g_object_unref (res);
+  GTask *task;
+
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_priority (task, io_priority);
+
+  g_task_run_in_thread (task, find_enclosing_mount_async_thread);
+  g_object_unref (task);
 }
 
 static GMount *
 g_file_real_find_enclosing_mount_finish (GFile         *file,
-                                         GAsyncResult  *res,
-                                         GError       **error)
+                                         GAsyncResult  *res,
+                                         GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  GMount *mount;
-
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_find_enclosing_mount_async);
+  g_return_val_if_fail (g_task_is_valid (res, file), NULL);
 
-  mount = g_simple_async_result_get_op_res_gpointer (simple);
-  return g_object_ref (mount);
+  return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 
@@ -5717,7 +6159,6 @@ typedef struct {
   GFileCopyFlags flags;
   GFileProgressCallback progress_cb;
   gpointer progress_cb_data;
-  GIOSchedulerJob *job;
 } CopyAsyncData;
 
 static void
@@ -5725,7 +6166,7 @@ copy_async_data_free (CopyAsyncData *data)
 {
   g_object_unref (data->source);
   g_object_unref (data->destination);
-  g_free (data);
+  g_slice_free (CopyAsyncData, data);
 }
 
 typedef struct {
@@ -5741,111 +6182,92 @@ copy_async_progress_in_main (gpointer user_data)
   CopyAsyncData *data = progress->data;
 
   data->progress_cb (progress->current_num_bytes,
-                    progress->total_num_bytes,
-                    data->progress_cb_data);
-
-  return FALSE;
-}
+                     progress->total_num_bytes,
+                     data->progress_cb_data);
 
-static gboolean
-mainloop_barrier (gpointer user_data)
-{
-  /* Does nothing, but ensures all queued idles before
-     this are run */
   return FALSE;
 }
 
-
 static void
 copy_async_progress_callback (goffset  current_num_bytes,
-                             goffset  total_num_bytes,
-                             gpointer user_data)
+                              goffset  total_num_bytes,
+                              gpointer user_data)
 {
-  CopyAsyncData *data = user_data;
+  GTask *task = user_data;
+  CopyAsyncData *data = g_task_get_task_data (task);
   ProgressData *progress;
 
   progress = g_new (ProgressData, 1);
   progress->data = data;
   progress->current_num_bytes = current_num_bytes;
   progress->total_num_bytes = total_num_bytes;
-  
-  g_io_scheduler_job_send_to_mainloop_async (data->job,
-                                            copy_async_progress_in_main,
-                                            progress,
-                                            g_free);
+
+  g_main_context_invoke_full (g_task_get_context (task),
+                              g_task_get_priority (task),
+                              copy_async_progress_in_main,
+                              progress,
+                              g_free);
 }
 
-static gboolean
-copy_async_thread (GIOSchedulerJob *job,
-                  GCancellable    *cancellable,
-                  gpointer         user_data)
+static void
+copy_async_thread (GTask        *task,
+                   gpointer      source,
+                   gpointer      task_data,
+                   GCancellable *cancellable)
 {
-  GSimpleAsyncResult *res;
-  CopyAsyncData *data;
+  CopyAsyncData *data = task_data;
   gboolean result;
-  GError *error;
-
-  res = user_data;
-  data = g_simple_async_result_get_op_res_gpointer (res);
+  GError *error = NULL;
 
-  error = NULL;
-  data->job = job;
   result = g_file_copy (data->source,
-                       data->destination,
-                       data->flags,
-                       cancellable,
-                       (data->progress_cb != NULL) ? copy_async_progress_callback : NULL,
-                       data,
-                       &error);
-
-  /* Ensure all progress callbacks are done running in main thread */
-  if (data->progress_cb != NULL)
-    g_io_scheduler_job_send_to_mainloop (job,
-                                        mainloop_barrier,
-                                        NULL, NULL);
-  
-  if (!result)
-    g_simple_async_result_take_error (res, error);
-
-  g_simple_async_result_complete_in_idle (res);
-
-  return FALSE;
+                        data->destination,
+                        data->flags,
+                        cancellable,
+                        (data->progress_cb != NULL) ? copy_async_progress_callback : NULL,
+                        task,
+                        &error);
+  if (result)
+    g_task_return_boolean (task, TRUE);
+  else
+    g_task_return_error (task, error);
 }
 
 static void
 g_file_real_copy_async (GFile                  *source,
-                       GFile                  *destination,
-                       GFileCopyFlags          flags,
-                       int                     io_priority,
-                       GCancellable           *cancellable,
-                       GFileProgressCallback   progress_callback,
-                       gpointer                progress_callback_data,
-                       GAsyncReadyCallback     callback,
-                       gpointer                user_data)
-{
-  GSimpleAsyncResult *res;
+                        GFile                  *destination,
+                        GFileCopyFlags          flags,
+                        int                     io_priority,
+                        GCancellable           *cancellable,
+                        GFileProgressCallback   progress_callback,
+                        gpointer                progress_callback_data,
+                        GAsyncReadyCallback     callback,
+                        gpointer                user_data)
+{
+  GTask *task;
   CopyAsyncData *data;
 
-  data = g_new0 (CopyAsyncData, 1);
+  data = g_slice_new (CopyAsyncData);
   data->source = g_object_ref (source);
   data->destination = g_object_ref (destination);
   data->flags = flags;
   data->progress_cb = progress_callback;
   data->progress_cb_data = progress_callback_data;
 
-  res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, g_file_real_copy_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)copy_async_data_free);
-
-  g_io_scheduler_push_job (copy_async_thread, res, g_object_unref, io_priority, cancellable);
+  task = g_task_new (source, cancellable, callback, user_data);
+  g_task_set_task_data (task, data, (GDestroyNotify)copy_async_data_free);
+  g_task_set_priority (task, io_priority);
+  g_task_run_in_thread (task, copy_async_thread);
+  g_object_unref (task);
 }
 
 static gboolean
 g_file_real_copy_finish (GFile        *file,
-                        GAsyncResult *res,
-                        GError      **error)
+                         GAsyncResult *res,
+                         GError      **error)
 {
-  /* Error handled in g_file_copy_finish() */
-  return TRUE;
+  g_return_val_if_fail (g_task_is_valid (res, file), FALSE);
+
+  return g_task_propagate_boolean (G_TASK (res), error);
 }
 
 
@@ -5855,16 +6277,16 @@ g_file_real_copy_finish (GFile        *file,
 
 /**
  * g_file_new_for_path:
- * @path: a string containing a relative or absolute path. The string
- *   must be encoded in the glib filename encoding.
- * 
+ * @path: a string containing a relative or absolute path.
+ *     The string must be encoded in the glib filename encoding.
+ *
  * Constructs a #GFile for a given path. This operation never
  * fails, but the returned object might not support any I/O
  * operation if @path is malformed.
- * 
+ *
  * Returns: (transfer full): a new #GFile for the given @path.
  *   Free the returned object with g_object_unref().
- **/
+ */
 GFile *
 g_file_new_for_path (const char *path)
 {
@@ -5872,19 +6294,19 @@ g_file_new_for_path (const char *path)
 
   return g_vfs_get_file_for_path (g_vfs_get_default (), path);
 }
+
 /**
  * g_file_new_for_uri:
- * @uri: a UTF8 string containing a URI.
- * 
- * Constructs a #GFile for a given URI. This operation never 
- * fails, but the returned object might not support any I/O 
- * operation if @uri is malformed or if the uri type is 
+ * @uri: a UTF-8 string containing a URI
+ *
+ * Constructs a #GFile for a given URI. This operation never
+ * fails, but the returned object might not support any I/O
+ * operation if @uri is malformed or if the uri type is
  * not supported.
- * 
+ *
  * Returns: (transfer full): a new #GFile for the given @uri.
- *   Free the returned object with g_object_unref().
- **/ 
+ *     Free the returned object with g_object_unref().
+ */
 GFile *
 g_file_new_for_uri (const char *uri)
 {
@@ -5896,15 +6318,15 @@ g_file_new_for_uri (const char *uri)
 /**
  * g_file_new_tmp:
  * @tmpl: (type filename) (allow-none): Template for the file
- *   name, as in g_file_open_tmp(), or %NULL for a default template.
- * @iostream: (out): on return, a #GFileIOStream for the created file.
+ *   name, as in g_file_open_tmp(), or %NULL for a default template
+ * @iostream: (out): on return, a #GFileIOStream for the created file
  * @error: a #GError, or %NULL
  *
  * Opens a file in the preferred directory for temporary files (as
  * returned by g_get_tmp_dir()) and returns a #GFile and
  * #GFileIOStream pointing to it.
  *
- * @template should be a string in the GLib file name encoding
+ * @tmpl should be a string in the GLib file name encoding
  * containing a sequence of six 'X' characters, and containing no
  * directory components. If it is %NULL, a default template is used.
  *
@@ -5912,8 +6334,10 @@ g_file_new_for_uri (const char *uri)
  * a temporary file could not be created.
  *
  * Returns: (transfer full): a new #GFile.
- *   Free the returned object with g_object_unref().
- **/
+ *     Free the returned object with g_object_unref().
+ *
+ * Since: 2.32
+ */
 GFile *
 g_file_new_tmp (const char     *tmpl,
                 GFileIOStream **iostream,
@@ -5924,7 +6348,6 @@ g_file_new_tmp (const char     *tmpl,
   GFile *file;
   GFileOutputStream *output;
 
-  g_return_val_if_fail (tmpl != NULL, NULL);
   g_return_val_if_fail (iostream != NULL, NULL);
 
   fd = g_file_open_tmp (tmpl, &path, error);
@@ -5944,14 +6367,15 @@ g_file_new_tmp (const char     *tmpl,
 
 /**
  * g_file_parse_name:
- * @parse_name: a file name or path to be parsed.
- * 
- * Constructs a #GFile with the given @parse_name (i.e. something given by g_file_get_parse_name()).
- * This operation never fails, but the returned object might not support any I/O
- * operation if the @parse_name cannot be parsed.
- * 
+ * @parse_name: a file name or path to be parsed
+ *
+ * Constructs a #GFile with the given @parse_name (i.e. something
+ * given by g_file_get_parse_name()). This operation never fails,
+ * but the returned object might not support any I/O operation if
+ * the @parse_name cannot be parsed.
+ *
  * Returns: (transfer full): a new #GFile.
- **/
+ */
 GFile *
 g_file_parse_name (const char *parse_name)
 {
@@ -5973,9 +6397,9 @@ static gboolean
 has_valid_scheme (const char *uri)
 {
   const char *p;
-  
+
   p = uri;
-  
+
   if (!g_ascii_isalpha (*p))
     return FALSE;
 
@@ -5986,70 +6410,127 @@ has_valid_scheme (const char *uri)
   return *p == ':';
 }
 
-/**
- * g_file_new_for_commandline_arg:
- * @arg: a command line string.
- * 
- * Creates a #GFile with the given argument from the command line. The value of
- * @arg can be either a URI, an absolute path or a relative path resolved
- * relative to the current working directory.
- * This operation never fails, but the returned object might not support any
- * I/O operation if @arg points to a malformed path.
- *
- * Returns: (transfer full): a new #GFile.
- *  Free the returned object with g_object_unref().
- **/
-GFile *
-g_file_new_for_commandline_arg (const char *arg)
+static GFile *
+new_for_cmdline_arg (const gchar *arg,
+                     const gchar *cwd)
 {
   GFile *file;
   char *filename;
-  char *current_dir;
-  
-  g_return_val_if_fail (arg != NULL, NULL);
-  
+
   if (g_path_is_absolute (arg))
     return g_file_new_for_path (arg);
 
   if (has_valid_scheme (arg))
     return g_file_new_for_uri (arg);
-    
-  current_dir = g_get_current_dir ();
-  filename = g_build_filename (current_dir, arg, NULL);
-  g_free (current_dir);
-  
+
+  if (cwd == NULL)
+    {
+      char *current_dir;
+
+      current_dir = g_get_current_dir ();
+      filename = g_build_filename (current_dir, arg, NULL);
+      g_free (current_dir);
+    }
+  else
+    filename = g_build_filename (cwd, arg, NULL);
+
   file = g_file_new_for_path (filename);
   g_free (filename);
-  
+
   return file;
 }
 
 /**
+ * g_file_new_for_commandline_arg:
+ * @arg: a command line string
+ *
+ * Creates a #GFile with the given argument from the command line.
+ * The value of @arg can be either a URI, an absolute path or a
+ * relative path resolved relative to the current working directory.
+ * This operation never fails, but the returned object might not
+ * support any I/O operation if @arg points to a malformed path.
+ *
+ * Note that on Windows, this function expects its argument to be in
+ * UTF-8 -- not the system code page.  This means that you
+ * should not use this function with string from argv as it is passed
+ * to main().  g_win32_get_command_line() will return a UTF-8 version of
+ * the commandline.  #GApplication also uses UTF-8 but
+ * g_application_command_line_create_file_for_arg() may be more useful
+ * for you there.  It is also always possible to use this function with
+ * #GOptionContext arguments of type %G_OPTION_ARG_FILENAME.
+ *
+ * Returns: (transfer full): a new #GFile.
+ *    Free the returned object with g_object_unref().
+ */
+GFile *
+g_file_new_for_commandline_arg (const char *arg)
+{
+  g_return_val_if_fail (arg != NULL, NULL);
+
+  return new_for_cmdline_arg (arg, NULL);
+}
+
+/**
+ * g_file_new_for_commandline_arg_and_cwd:
+ * @arg: a command line string
+ * @cwd: the current working directory of the commandline
+ *
+ * Creates a #GFile with the given argument from the command line.
+ *
+ * This function is similar to g_file_new_for_commandline_arg() except
+ * that it allows for passing the current working directory as an
+ * argument instead of using the current working directory of the
+ * process.
+ *
+ * This is useful if the commandline argument was given in a context
+ * other than the invocation of the current process.
+ *
+ * See also g_application_command_line_create_file_for_arg().
+ *
+ * Returns: (transfer full): a new #GFile
+ *
+ * Since: 2.36
+ **/
+GFile *
+g_file_new_for_commandline_arg_and_cwd (const gchar *arg,
+                                        const gchar *cwd)
+{
+  g_return_val_if_fail (arg != NULL, NULL);
+  g_return_val_if_fail (cwd != NULL, NULL);
+
+  return new_for_cmdline_arg (arg, cwd);
+}
+
+/**
  * g_file_mount_enclosing_volume:
- * @location: input #GFile.
+ * @location: input #GFile
  * @flags: flags affecting the operation
- * @mount_operation: a #GMountOperation or %NULL to avoid user interaction.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @callback: a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @mount_operation: (allow-none): a #GMountOperation
+ *     or %NULL to avoid user interaction
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (allow-none): a #GAsyncReadyCallback to call
+ *     when the request is satisfied, or %NULL
  * @user_data: the data to pass to callback function
- * 
- * Starts a @mount_operation, mounting the volume that contains the file @location. 
- * 
+ *
+ * Starts a @mount_operation, mounting the volume that contains
+ * the file @location.
+ *
  * When this operation has completed, @callback will be called with
- * @user_user data, and the operation can be finalized with 
+ * @user_user data, and the operation can be finalized with
  * g_file_mount_enclosing_volume_finish().
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- **/
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ */
 void
 g_file_mount_enclosing_volume (GFile               *location,
-                              GMountMountFlags     flags,
-                              GMountOperation     *mount_operation,
-                              GCancellable        *cancellable,
-                              GAsyncReadyCallback  callback,
-                              gpointer             user_data)
+                               GMountMountFlags     flags,
+                               GMountOperation     *mount_operation,
+                               GCancellable        *cancellable,
+                               GAsyncReadyCallback  callback,
+                               gpointer             user_data)
 {
   GFileIface *iface;
 
@@ -6059,47 +6540,44 @@ g_file_mount_enclosing_volume (GFile               *location,
 
   if (iface->mount_enclosing_volume == NULL)
     {
-      g_simple_async_report_error_in_idle (G_OBJECT (location),
-                                          callback, user_data,
-                                          G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                                          _("volume doesn't implement mount"));
-      
+      g_task_report_new_error (location, callback, user_data,
+                               g_file_mount_enclosing_volume,
+                               G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                               _("volume doesn't implement mount"));
       return;
     }
-  
+
   (* iface->mount_enclosing_volume) (location, flags, mount_operation, cancellable, callback, user_data);
 
 }
 
 /**
  * g_file_mount_enclosing_volume_finish:
- * @location: input #GFile.
- * @result: a #GAsyncResult.
+ * @location: input #GFile
+ * @result: a #GAsyncResult
  * @error: a #GError, or %NULL
- * 
+ *
  * Finishes a mount operation started by g_file_mount_enclosing_volume().
- * 
- * Returns: %TRUE if successful. If an error
- * has occurred, this function will return %FALSE and set @error
- * appropriately if present.
- **/
+ *
+ * Returns: %TRUE if successful. If an error has occurred,
+ *     this function will return %FALSE and set @error
+ *     appropriately if present.
+ */
 gboolean
 g_file_mount_enclosing_volume_finish (GFile         *location,
-                                     GAsyncResult  *result,
-                                     GError       **error)
+                                      GAsyncResult  *result,
+                                      GError       **error)
 {
   GFileIface *iface;
 
   g_return_val_if_fail (G_IS_FILE (location), FALSE);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (result))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return FALSE;
-    }
-  
+  if (g_async_result_legacy_propagate_error (result, error))
+    return FALSE;
+  else if (g_async_result_is_tagged (result, g_file_mount_enclosing_volume))
+    return g_task_propagate_boolean (G_TASK (result), error);
+
   iface = G_FILE_GET_IFACE (location);
 
   return (* iface->mount_enclosing_volume_finish) (location, result, error);
@@ -6111,8 +6589,8 @@ g_file_mount_enclosing_volume_finish (GFile         *location,
 
 /**
  * g_file_query_default_handler:
- * @file: a #GFile to open.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
+ * @file: a #GFile to open
+ * @cancellable: optional #GCancellable object, %NULL to ignore
  * @error: a #GError, or %NULL
  *
  * Returns the #GAppInfo that is registered as the default
@@ -6120,22 +6598,23 @@ g_file_mount_enclosing_volume_finish (GFile         *location,
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
- * Returns: (transfer full): a #GAppInfo if the handle was found, %NULL if there were errors.
- * When you are done with it, release it with g_object_unref()
- **/
+ * Returns: (transfer full): a #GAppInfo if the handle was found,
+ *     %NULL if there were errors.
+ *     When you are done with it, release it with g_object_unref()
+ */
 GAppInfo *
-g_file_query_default_handler (GFile                  *file,
-                             GCancellable           *cancellable,
-                             GError                **error)
+g_file_query_default_handler (GFile         *file,
+                              GCancellable  *cancellable,
+                              GError       **error)
 {
   char *uri_scheme;
   const char *content_type;
   GAppInfo *appinfo;
   GFileInfo *info;
   char *path;
-  
+
   uri_scheme = g_file_get_uri_scheme (file);
   if (uri_scheme && uri_scheme[0] != '\0')
     {
@@ -6147,10 +6626,10 @@ g_file_query_default_handler (GFile                  *file,
     }
 
   info = g_file_query_info (file,
-                           G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-                           0,
-                           cancellable,
-                           error);
+                            G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+                            0,
+                            cancellable,
+                            error);
   if (info == NULL)
     return NULL;
 
@@ -6162,10 +6641,10 @@ g_file_query_default_handler (GFile                  *file,
       /* Don't use is_native(), as we want to support fuse paths if available */
       path = g_file_get_path (file);
       appinfo = g_app_info_get_default_for_type (content_type,
-                                                path == NULL);
+                                                 path == NULL);
       g_free (path);
     }
-  
+
   g_object_unref (info);
 
   if (appinfo != NULL)
@@ -6175,42 +6654,40 @@ g_file_query_default_handler (GFile                  *file,
                        G_IO_ERROR_NOT_SUPPORTED,
                        _("No application is registered as handling this file"));
   return NULL;
-  
 }
 
-
 #define GET_CONTENT_BLOCK_SIZE 8192
 
 /**
  * g_file_load_contents:
- * @file: input #GFile.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file.
+ * @file: input #GFile
+ * @cancellable: optional #GCancellable object, %NULL to ignore
+ * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file
  * @length: (out) (allow-none): a location to place the length of the contents of the file,
  *    or %NULL if the length is not needed
  * @etag_out: (out) (allow-none): a location to place the current entity tag for the file,
  *    or %NULL if the entity tag is not needed
  * @error: a #GError, or %NULL
  *
- * Loads the content of the file into memory. The data is always 
+ * Loads the content of the file into memory. The data is always
  * zero-terminated, but this is not included in the resultant @length.
  * The returned @content should be freed with g_free() when no longer
  * needed.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
  * Returns: %TRUE if the @file's contents were successfully loaded.
- * %FALSE if there were errors.
- **/
+ *     %FALSE if there were errors.
+ */
 gboolean
 g_file_load_contents (GFile         *file,
-                     GCancellable  *cancellable,
-                     char         **contents,
-                     gsize         *length,
-                     char         **etag_out,
-                     GError       **error)
+                      GCancellable  *cancellable,
+                      char         **contents,
+                      gsize         *length,
+                      char         **etag_out,
+                      GError       **error)
 {
   GFileInputStream *in;
   GByteArray *content;
@@ -6227,12 +6704,12 @@ g_file_load_contents (GFile         *file,
 
   content = g_byte_array_new ();
   pos = 0;
-  
+
   g_byte_array_set_size (content, pos + GET_CONTENT_BLOCK_SIZE + 1);
   while ((res = g_input_stream_read (G_INPUT_STREAM (in),
-                                    content->data + pos,
-                                    GET_CONTENT_BLOCK_SIZE,
-                                    cancellable, error)) > 0)
+                                     content->data + pos,
+                                     GET_CONTENT_BLOCK_SIZE,
+                                     cancellable, error)) > 0)
     {
       pos += res;
       g_byte_array_set_size (content, pos + GET_CONTENT_BLOCK_SIZE + 1);
@@ -6241,17 +6718,17 @@ g_file_load_contents (GFile         *file,
   if (etag_out)
     {
       *etag_out = NULL;
-      
+
       info = g_file_input_stream_query_info (in,
-                                            G_FILE_ATTRIBUTE_ETAG_VALUE,
-                                            cancellable,
-                                            NULL);
+                                             G_FILE_ATTRIBUTE_ETAG_VALUE,
+                                             cancellable,
+                                             NULL);
       if (info)
-       {
-         *etag_out = g_strdup (g_file_info_get_etag (info));
-         g_object_unref (info);
-       }
-    } 
+        {
+          *etag_out = g_strdup (g_file_info_get_etag (info));
+          g_object_unref (info);
+        }
+    }
 
   /* Ignore errors on close */
   g_input_stream_close (G_INPUT_STREAM (in), cancellable, NULL);
@@ -6269,19 +6746,15 @@ g_file_load_contents (GFile         *file,
 
   /* Zero terminate (we got an extra byte allocated for this */
   content->data[pos] = 0;
-  
+
   *contents = (char *)g_byte_array_free (content, FALSE);
-  
+
   return TRUE;
 }
 
 typedef struct {
-  GFile *file;
-  GError *error;
-  GCancellable *cancellable;
+  GTask *task;
   GFileReadMoreCallback read_more_callback;
-  GAsyncReadyCallback callback;
-  gpointer user_data;
   GByteArray *content;
   gsize pos;
   char *etag;
@@ -6291,50 +6764,39 @@ typedef struct {
 static void
 load_contents_data_free (LoadContentsData *data)
 {
-  if (data->error)
-    g_error_free (data->error);
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
   if (data->content)
     g_byte_array_free (data->content, TRUE);
   g_free (data->etag);
-  g_object_unref (data->file);
   g_free (data);
 }
 
 static void
 load_contents_close_callback (GObject      *obj,
-                             GAsyncResult *close_res,
-                             gpointer      user_data)
+                              GAsyncResult *close_res,
+                              gpointer      user_data)
 {
   GInputStream *stream = G_INPUT_STREAM (obj);
   LoadContentsData *data = user_data;
-  GSimpleAsyncResult *res;
 
   /* Ignore errors here, we're only reading anyway */
   g_input_stream_close_finish (stream, close_res, NULL);
   g_object_unref (stream);
 
-  res = g_simple_async_result_new (G_OBJECT (data->file),
-                                  data->callback,
-                                  data->user_data,
-                                  g_file_load_contents_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)load_contents_data_free);
-  g_simple_async_result_complete (res);
-  g_object_unref (res);
+  g_task_return_boolean (data->task, TRUE);
+  g_object_unref (data->task);
 }
 
 static void
 load_contents_fstat_callback (GObject      *obj,
-                             GAsyncResult *stat_res,
-                             gpointer      user_data)
+                              GAsyncResult *stat_res,
+                              gpointer      user_data)
 {
   GInputStream *stream = G_INPUT_STREAM (obj);
   LoadContentsData *data = user_data;
   GFileInfo *info;
 
   info = g_file_input_stream_query_info_finish (G_FILE_INPUT_STREAM (stream),
-                                                  stat_res, NULL);
+                                                stat_res, NULL);
   if (info)
     {
       data->etag = g_strdup (g_file_info_get_etag (info));
@@ -6342,14 +6804,14 @@ load_contents_fstat_callback (GObject      *obj,
     }
 
   g_input_stream_close_async (stream, 0,
-                             data->cancellable,
-                             load_contents_close_callback, data);
+                              g_task_get_cancellable (data->task),
+                              load_contents_close_callback, data);
 }
 
 static void
 load_contents_read_callback (GObject      *obj,
-                            GAsyncResult *read_res,
-                            gpointer      user_data)
+                             GAsyncResult *read_res,
+                             gpointer      user_data)
 {
   GInputStream *stream = G_INPUT_STREAM (obj);
   LoadContentsData *data = user_data;
@@ -6358,190 +6820,175 @@ load_contents_read_callback (GObject      *obj,
 
   read_size = g_input_stream_read_finish (stream, read_res, &error);
 
-  if (read_size < 0) 
+  if (read_size < 0)
     {
-      /* Error or EOF, close the file */
-      data->error = error;
-      g_input_stream_close_async (stream, 0,
-                                 data->cancellable,
-                                 load_contents_close_callback, data);
+      g_task_return_error (data->task, error);
+      g_object_unref (data->task);
+
+      /* Close the file ignoring any error */
+      g_input_stream_close_async (stream, 0, NULL, NULL, NULL);
+      g_object_unref (stream);
     }
   else if (read_size == 0)
     {
       g_file_input_stream_query_info_async (G_FILE_INPUT_STREAM (stream),
-                                           G_FILE_ATTRIBUTE_ETAG_VALUE,
-                                           0,
-                                           data->cancellable,
-                                           load_contents_fstat_callback,
-                                           data);
+                                            G_FILE_ATTRIBUTE_ETAG_VALUE,
+                                            0,
+                                            g_task_get_cancellable (data->task),
+                                            load_contents_fstat_callback,
+                                            data);
     }
   else if (read_size > 0)
     {
       data->pos += read_size;
-      
+
       g_byte_array_set_size (data->content,
-                            data->pos + GET_CONTENT_BLOCK_SIZE);
+                             data->pos + GET_CONTENT_BLOCK_SIZE);
 
 
       if (data->read_more_callback &&
-         !data->read_more_callback ((char *)data->content->data, data->pos, data->user_data))
-       g_file_input_stream_query_info_async (G_FILE_INPUT_STREAM (stream),
-                                             G_FILE_ATTRIBUTE_ETAG_VALUE,
-                                             0,
-                                             data->cancellable,
-                                             load_contents_fstat_callback,
-                                             data);
-      else 
-       g_input_stream_read_async (stream,
-                                  data->content->data + data->pos,
-                                  GET_CONTENT_BLOCK_SIZE,
-                                  0,
-                                  data->cancellable,
-                                  load_contents_read_callback,
-                                  data);
+          !data->read_more_callback ((char *)data->content->data, data->pos,
+                                     g_async_result_get_user_data (G_ASYNC_RESULT (data->task))))
+        g_file_input_stream_query_info_async (G_FILE_INPUT_STREAM (stream),
+                                              G_FILE_ATTRIBUTE_ETAG_VALUE,
+                                              0,
+                                              g_task_get_cancellable (data->task),
+                                              load_contents_fstat_callback,
+                                              data);
+      else
+        g_input_stream_read_async (stream,
+                                   data->content->data + data->pos,
+                                   GET_CONTENT_BLOCK_SIZE,
+                                   0,
+                                   g_task_get_cancellable (data->task),
+                                   load_contents_read_callback,
+                                   data);
     }
 }
 
 static void
 load_contents_open_callback (GObject      *obj,
-                            GAsyncResult *open_res,
-                            gpointer      user_data)
+                             GAsyncResult *open_res,
+                             gpointer      user_data)
 {
   GFile *file = G_FILE (obj);
   GFileInputStream *stream;
   LoadContentsData *data = user_data;
   GError *error = NULL;
-  GSimpleAsyncResult *res;
 
   stream = g_file_read_finish (file, open_res, &error);
 
   if (stream)
     {
       g_byte_array_set_size (data->content,
-                            data->pos + GET_CONTENT_BLOCK_SIZE);
+                             data->pos + GET_CONTENT_BLOCK_SIZE);
       g_input_stream_read_async (G_INPUT_STREAM (stream),
-                                data->content->data + data->pos,
-                                GET_CONTENT_BLOCK_SIZE,
-                                0,
-                                data->cancellable,
-                                load_contents_read_callback,
-                                data);
-      
+                                 data->content->data + data->pos,
+                                 GET_CONTENT_BLOCK_SIZE,
+                                 0,
+                                 g_task_get_cancellable (data->task),
+                                 load_contents_read_callback,
+                                 data);
     }
   else
     {
-      res = g_simple_async_result_new_take_error (G_OBJECT (data->file),
-                                                 data->callback,
-                                                 data->user_data,
-                                                 error);
-      g_simple_async_result_complete (res);
-      load_contents_data_free (data);
-      g_object_unref (res);
+      g_task_return_error (data->task, error);
+      g_object_unref (data->task);
     }
 }
 
 /**
  * g_file_load_partial_contents_async: (skip)
- * @file: input #GFile.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @read_more_callback: a #GFileReadMoreCallback to receive partial data and to specify whether further data should be read.
+ * @file: input #GFile
+ * @cancellable: optional #GCancellable object, %NULL to ignore
+ * @read_more_callback: a #GFileReadMoreCallback to receive partial data
+ *     and to specify whether further data should be read
  * @callback: a #GAsyncReadyCallback to call when the request is satisfied
- * @user_data: the data to pass to the callback functions.
+ * @user_data: the data to pass to the callback functions
  *
- * Reads the partial contents of a file. A #GFileReadMoreCallback should be 
- * used to stop reading from the file when appropriate, else this function
- * will behave exactly as g_file_load_contents_async(). This operation 
- * can be finished by g_file_load_partial_contents_finish().
+ * Reads the partial contents of a file. A #GFileReadMoreCallback should
+ * be used to stop reading from the file when appropriate, else this
+ * function will behave exactly as g_file_load_contents_async(). This
+ * operation can be finished by g_file_load_partial_contents_finish().
  *
- * Users of this function should be aware that @user_data is passed to 
+ * Users of this function should be aware that @user_data is passed to
  * both the @read_more_callback and the @callback.
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- **/
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ */
 void
 g_file_load_partial_contents_async (GFile                 *file,
-                                   GCancellable          *cancellable,
-                                   GFileReadMoreCallback  read_more_callback,
-                                   GAsyncReadyCallback    callback,
-                                   gpointer               user_data)
+                                    GCancellable          *cancellable,
+                                    GFileReadMoreCallback  read_more_callback,
+                                    GAsyncReadyCallback    callback,
+                                    gpointer               user_data)
 {
   LoadContentsData *data;
 
   g_return_if_fail (G_IS_FILE (file));
 
   data = g_new0 (LoadContentsData, 1);
-
-  if (cancellable)
-    data->cancellable = g_object_ref (cancellable);
   data->read_more_callback = read_more_callback;
-  data->callback = callback;
-  data->user_data = user_data;
   data->content = g_byte_array_new ();
-  data->file = g_object_ref (file);
+
+  data->task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (data->task, data, (GDestroyNotify)load_contents_data_free);
 
   g_file_read_async (file,
-                    0,
-                    cancellable,
-                    load_contents_open_callback,
-                    data);
+                     0,
+                     g_task_get_cancellable (data->task),
+                     load_contents_open_callback,
+                     data);
 }
 
 /**
  * g_file_load_partial_contents_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult
- * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file.
+ * @file: input #GFile
+ * @res: a #GAsyncResult
+ * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file
  * @length: (out) (allow-none): a location to place the length of the contents of the file,
  *     or %NULL if the length is not needed
  * @etag_out: (out) (allow-none): a location to place the current entity tag for the file,
  *     or %NULL if the entity tag is not needed
  * @error: a #GError, or %NULL
- * 
+ *
  * Finishes an asynchronous partial load operation that was started
- * with g_file_load_partial_contents_async(). The data is always 
+ * with g_file_load_partial_contents_async(). The data is always
  * zero-terminated, but this is not included in the resultant @length.
  * The returned @content should be freed with g_free() when no longer
  * needed.
  *
- * Returns: %TRUE if the load was successful. If %FALSE and @error is 
- * present, it will be set appropriately. 
- **/
+ * Returns: %TRUE if the load was successful. If %FALSE and @error is
+ *     present, it will be set appropriately.
+ */
 gboolean
 g_file_load_partial_contents_finish (GFile         *file,
-                                    GAsyncResult  *res,
-                                    char         **contents,
-                                    gsize         *length,
-                                    char         **etag_out,
-                                    GError       **error)
+                                     GAsyncResult  *res,
+                                     char         **contents,
+                                     gsize         *length,
+                                     char         **etag_out,
+                                     GError       **error)
 {
-  GSimpleAsyncResult *simple;
+  GTask *task;
   LoadContentsData *data;
 
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
-  g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE);
+  g_return_val_if_fail (g_task_is_valid (res, file), FALSE);
   g_return_val_if_fail (contents != NULL, FALSE);
 
-  simple = G_SIMPLE_ASYNC_RESULT (res);
+  task = G_TASK (res);
 
-  if (g_simple_async_result_propagate_error (simple, error))
-    return FALSE;
-  
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_load_contents_async);
-  
-  data = g_simple_async_result_get_op_res_gpointer (simple);
-
-  if (data->error)
+  if (!g_task_propagate_boolean (task, error))
     {
-      g_propagate_error (error, data->error);
-      data->error = NULL;
-      *contents = NULL;
       if (length)
-       *length = 0;
+        *length = 0;
       return FALSE;
     }
 
+  data = g_task_get_task_data (task);
+
   if (length)
     *length = data->pos;
 
@@ -6554,7 +7001,7 @@ g_file_load_partial_contents_finish (GFile         *file,
   /* Zero terminate */
   g_byte_array_set_size (data->content, data->pos + 1);
   data->content->data[data->pos] = 0;
-  
+
   *contents = (char *)g_byte_array_free (data->content, FALSE);
   data->content = NULL;
 
@@ -6563,116 +7010,116 @@ g_file_load_partial_contents_finish (GFile         *file,
 
 /**
  * g_file_load_contents_async:
- * @file: input #GFile.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @cancellable: optional #GCancellable object, %NULL to ignore
  * @callback: a #GAsyncReadyCallback to call when the request is satisfied
  * @user_data: the data to pass to callback function
- * 
+ *
  * Starts an asynchronous load of the @file's contents.
  *
  * For more details, see g_file_load_contents() which is
  * the synchronous version of this call.
  *
- * When the load operation has completed, @callback will be called 
- * with @user data. To finish the operation, call 
- * g_file_load_contents_finish() with the #GAsyncResult returned by 
+ * When the load operation has completed, @callback will be called
+ * with @user data. To finish the operation, call
+ * g_file_load_contents_finish() with the #GAsyncResult returned by
  * the @callback.
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- **/
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ */
 void
 g_file_load_contents_async (GFile               *file,
-                          GCancellable        *cancellable,
-                          GAsyncReadyCallback  callback,
-                          gpointer             user_data)
+                           GCancellable        *cancellable,
+                           GAsyncReadyCallback  callback,
+                           gpointer             user_data)
 {
   g_file_load_partial_contents_async (file,
-                                     cancellable,
-                                     NULL,
-                                     callback, user_data);
+                                      cancellable,
+                                      NULL,
+                                      callback, user_data);
 }
 
 /**
  * g_file_load_contents_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult
- * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file.
+ * @file: input #GFile
+ * @res: a #GAsyncResult
+ * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file
  * @length: (out) (allow-none): a location to place the length of the contents of the file,
  *     or %NULL if the length is not needed
  * @etag_out: (out) (allow-none): a location to place the current entity tag for the file,
  *     or %NULL if the entity tag is not needed
  * @error: a #GError, or %NULL
- * 
- * Finishes an asynchronous load of the @file's contents. 
- * The contents are placed in @contents, and @length is set to the 
+ *
+ * Finishes an asynchronous load of the @file's contents.
+ * The contents are placed in @contents, and @length is set to the
  * size of the @contents string. The @content should be freed with
- * g_free() when no longer needed. If @etag_out is present, it will be 
+ * g_free() when no longer needed. If @etag_out is present, it will be
  * set to the new entity tag for the @file.
- * 
- * Returns: %TRUE if the load was successful. If %FALSE and @error is 
- * present, it will be set appropriately. 
- **/
+ *
+ * Returns: %TRUE if the load was successful. If %FALSE and @error is
+ *     present, it will be set appropriately.
+ */
 gboolean
 g_file_load_contents_finish (GFile         *file,
-                            GAsyncResult  *res,
-                            char         **contents,
-                            gsize         *length,
-                            char         **etag_out,
-                            GError       **error)
+                             GAsyncResult  *res,
+                             char         **contents,
+                             gsize         *length,
+                             char         **etag_out,
+                             GError       **error)
 {
   return g_file_load_partial_contents_finish (file,
-                                             res,
-                                             contents,
-                                             length,
-                                             etag_out,
-                                             error);
+                                              res,
+                                              contents,
+                                              length,
+                                              etag_out,
+                                              error);
 }
-  
+
 /**
  * g_file_replace_contents:
- * @file: input #GFile.
- * @contents: (element-type guint8) (array length=length): a string containing the new contents for @file.
- * @length: the length of @contents in bytes.
- * @etag: (allow-none): the old <link linkend="gfile-etag">entity tag</link> 
- *     for the document, or %NULL
- * @make_backup: %TRUE if a backup should be created.
- * @flags: a set of #GFileCreateFlags.
- * @new_etag: (allow-none) (out): a location to a new <link linkend="gfile-etag">entity tag</link>
- *      for the document. This should be freed with g_free() when no longer 
+ * @file: input #GFile
+ * @contents: (element-type guint8) (array length=length): a string containing the new contents for @file
+ * @length: the length of @contents in bytes
+ * @etag: (allow-none): the old [entity-tag][gfile-etag] for the document,
+ *     or %NULL
+ * @make_backup: %TRUE if a backup should be created
+ * @flags: a set of #GFileCreateFlags
+ * @new_etag: (allow-none) (out): a location to a new [entity tag][gfile-etag]
+ *      for the document. This should be freed with g_free() when no longer
  *      needed, or %NULL
- * @cancellable: optional #GCancellable object, %NULL to ignore.
+ * @cancellable: optional #GCancellable object, %NULL to ignore
  * @error: a #GError, or %NULL
  *
  * Replaces the contents of @file with @contents of @length bytes.
- * If @etag is specified (not %NULL) any existing file must have that etag, or
- * the error %G_IO_ERROR_WRONG_ETAG will be returned.
  *
- * If @make_backup is %TRUE, this function will attempt to make a backup of @file.
- * 
+ * If @etag is specified (not %NULL), any existing file must have that etag,
+ * or the error %G_IO_ERROR_WRONG_ETAG will be returned.
+ *
+ * If @make_backup is %TRUE, this function will attempt to make a backup
+ * of @file.
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
- * The returned @new_etag can be used to verify that the file hasn't changed the
- * next time it is saved over.
- * 
- * Returns: %TRUE if successful. If an error
- * has occurred, this function will return %FALSE and set @error
- * appropriately if present.
- **/
+ * The returned @new_etag can be used to verify that the file hasn't
+ * changed the next time it is saved over.
+ *
+ * Returns: %TRUE if successful. If an error has occurred, this function
+ *     will return %FALSE and set @error appropriately if present.
+ */
 gboolean
 g_file_replace_contents (GFile             *file,
-                        const char        *contents,
-                        gsize              length,
-                        const char        *etag,
-                        gboolean           make_backup,
-                        GFileCreateFlags   flags,
-                        char             **new_etag,
-                        GCancellable      *cancellable,
-                        GError           **error)
+                         const char        *contents,
+                         gsize              length,
+                         const char        *etag,
+                         gboolean           make_backup,
+                         GFileCreateFlags   flags,
+                         char             **new_etag,
+                         GCancellable      *cancellable,
+                         GError           **error)
 {
   GFileOutputStream *out;
   gsize pos, remainder;
@@ -6689,16 +7136,16 @@ g_file_replace_contents (GFile             *file,
   pos = 0;
   remainder = length;
   while (remainder > 0 &&
-        (res = g_output_stream_write (G_OUTPUT_STREAM (out),
-                                      contents + pos,
-                                      MIN (remainder, GET_CONTENT_BLOCK_SIZE),
-                                      cancellable,
-                                      error)) > 0)
+         (res = g_output_stream_write (G_OUTPUT_STREAM (out),
+                                       contents + pos,
+                                       MIN (remainder, GET_CONTENT_BLOCK_SIZE),
+                                       cancellable,
+                                       error)) > 0)
     {
       pos += res;
       remainder -= res;
     }
-  
+
   if (remainder > 0 && res < 0)
     {
       /* Ignore errors on close */
@@ -6708,7 +7155,7 @@ g_file_replace_contents (GFile             *file,
       /* error is set already */
       return FALSE;
     }
-  
+
   ret = g_output_stream_close (G_OUTPUT_STREAM (out), cancellable, error);
 
   if (new_etag)
@@ -6720,166 +7167,203 @@ g_file_replace_contents (GFile             *file,
 }
 
 typedef struct {
-  GFile *file;
-  GError *error;
-  GCancellable *cancellable;
-  GAsyncReadyCallback callback;
-  gpointer user_data;
-  const char *content;
-  gsize length;
+  GTask *task;
+  GBytes *content;
   gsize pos;
   char *etag;
+  gboolean failed;
 } ReplaceContentsData;
 
 static void
 replace_contents_data_free (ReplaceContentsData *data)
 {
-  if (data->error)
-    g_error_free (data->error);
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
-  g_object_unref (data->file);
+  g_bytes_unref (data->content);
   g_free (data->etag);
   g_free (data);
 }
 
 static void
 replace_contents_close_callback (GObject      *obj,
-                                GAsyncResult *close_res,
-                                gpointer      user_data)
+                                 GAsyncResult *close_res,
+                                 gpointer      user_data)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (obj);
   ReplaceContentsData *data = user_data;
-  GSimpleAsyncResult *res;
 
   /* Ignore errors here, we're only reading anyway */
   g_output_stream_close_finish (stream, close_res, NULL);
   g_object_unref (stream);
 
-  data->etag = g_file_output_stream_get_etag (G_FILE_OUTPUT_STREAM (stream));
-  
-  res = g_simple_async_result_new (G_OBJECT (data->file),
-                                  data->callback,
-                                  data->user_data,
-                                  g_file_replace_contents_async);
-  g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)replace_contents_data_free);
-  g_simple_async_result_complete (res);
-  g_object_unref (res);
+  if (!data->failed)
+    {
+      data->etag = g_file_output_stream_get_etag (G_FILE_OUTPUT_STREAM (stream));
+      g_task_return_boolean (data->task, TRUE);
+    }
+  g_object_unref (data->task);
 }
 
 static void
 replace_contents_write_callback (GObject      *obj,
-                                GAsyncResult *read_res,
-                                gpointer      user_data)
+                                 GAsyncResult *read_res,
+                                 gpointer      user_data)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (obj);
   ReplaceContentsData *data = user_data;
   GError *error = NULL;
   gssize write_size;
-  
+
   write_size = g_output_stream_write_finish (stream, read_res, &error);
 
-  if (write_size <= 0) 
+  if (write_size <= 0)
     {
       /* Error or EOF, close the file */
       if (write_size < 0)
-       data->error = error;
+        {
+          data->failed = TRUE;
+          g_task_return_error (data->task, error);
+        }
       g_output_stream_close_async (stream, 0,
-                                  data->cancellable,
-                                  replace_contents_close_callback, data);
+                                   g_task_get_cancellable (data->task),
+                                   replace_contents_close_callback, data);
     }
   else if (write_size > 0)
     {
+      const gchar *content;
+      gsize length;
+
+      content = g_bytes_get_data (data->content, &length);
       data->pos += write_size;
 
-      if (data->pos >= data->length)
-       g_output_stream_close_async (stream, 0,
-                                    data->cancellable,
-                                    replace_contents_close_callback, data);
+      if (data->pos >= length)
+        g_output_stream_close_async (stream, 0,
+                                     g_task_get_cancellable (data->task),
+                                     replace_contents_close_callback, data);
       else
-       g_output_stream_write_async (stream,
-                                    data->content + data->pos,
-                                    data->length - data->pos,
-                                    0,
-                                    data->cancellable,
-                                    replace_contents_write_callback,
-                                    data);
+        g_output_stream_write_async (stream,
+                                     content + data->pos,
+                                     length - data->pos,
+                                     0,
+                                     g_task_get_cancellable (data->task),
+                                     replace_contents_write_callback,
+                                     data);
     }
 }
 
 static void
 replace_contents_open_callback (GObject      *obj,
-                               GAsyncResult *open_res,
-                               gpointer      user_data)
+                                GAsyncResult *open_res,
+                                gpointer      user_data)
 {
   GFile *file = G_FILE (obj);
   GFileOutputStream *stream;
   ReplaceContentsData *data = user_data;
   GError *error = NULL;
-  GSimpleAsyncResult *res;
 
   stream = g_file_replace_finish (file, open_res, &error);
 
   if (stream)
     {
+      const gchar *content;
+      gsize length;
+
+      content = g_bytes_get_data (data->content, &length);
       g_output_stream_write_async (G_OUTPUT_STREAM (stream),
-                                  data->content + data->pos,
-                                  data->length - data->pos,
-                                  0,
-                                  data->cancellable,
-                                  replace_contents_write_callback,
-                                  data);
-      
+                                   content + data->pos,
+                                   length - data->pos,
+                                   0,
+                                   g_task_get_cancellable (data->task),
+                                   replace_contents_write_callback,
+                                   data);
     }
   else
     {
-      res = g_simple_async_result_new_take_error (G_OBJECT (data->file),
-                                                 data->callback,
-                                                 data->user_data,
-                                                 error);
-      g_simple_async_result_complete (res);
-      replace_contents_data_free (data);
-      g_object_unref (res);
+      g_task_return_error (data->task, error);
+      g_object_unref (data->task);
     }
 }
 
 /**
  * g_file_replace_contents_async:
- * @file: input #GFile.
- * @contents: (element-type guint8) (array length=length): string of contents to replace the file with.
- * @length: the length of @contents in bytes.
- * @etag: (allow-none): a new <link linkend="gfile-etag">entity tag</link> for the @file, or %NULL
- * @make_backup: %TRUE if a backup should be created.
- * @flags: a set of #GFileCreateFlags.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
+ * @file: input #GFile
+ * @contents: (element-type guint8) (array length=length): string of contents to replace the file with
+ * @length: the length of @contents in bytes
+ * @etag: (allow-none): a new [entity tag][gfile-etag] for the @file, or %NULL
+ * @make_backup: %TRUE if a backup should be created
+ * @flags: a set of #GFileCreateFlags
+ * @cancellable: optional #GCancellable object, %NULL to ignore
  * @callback: a #GAsyncReadyCallback to call when the request is satisfied
  * @user_data: the data to pass to callback function
- * 
- * Starts an asynchronous replacement of @file with the given 
- * @contents of @length bytes. @etag will replace the document's 
+ *
+ * Starts an asynchronous replacement of @file with the given
+ * @contents of @length bytes. @etag will replace the document's
  * current entity tag.
- * 
+ *
  * When this operation has completed, @callback will be called with
- * @user_user data, and the operation can be finalized with 
+ * @user_user data, and the operation can be finalized with
  * g_file_replace_contents_finish().
- * 
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
- * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
- * 
- * If @make_backup is %TRUE, this function will attempt to 
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
+ *
+ * If @make_backup is %TRUE, this function will attempt to
  * make a backup of @file.
- **/
+ *
+ * Note that no copy of @content will be made, so it must stay valid
+ * until @callback is called. See g_file_replace_contents_bytes_async()
+ * for a #GBytes version that will automatically hold a reference to the
+ * contents (without copying) for the duration of the call.
+ */
 void
 g_file_replace_contents_async  (GFile               *file,
-                               const char          *contents,
-                               gsize                length,
-                               const char          *etag,
-                               gboolean             make_backup,
-                               GFileCreateFlags     flags,
-                               GCancellable        *cancellable,
-                               GAsyncReadyCallback  callback,
-                               gpointer             user_data)
+                                const char          *contents,
+                                gsize                length,
+                                const char          *etag,
+                                gboolean             make_backup,
+                                GFileCreateFlags     flags,
+                                GCancellable        *cancellable,
+                                GAsyncReadyCallback  callback,
+                                gpointer             user_data)
+{
+  GBytes *bytes;
+
+  bytes = g_bytes_new_static (contents, length);
+  g_file_replace_contents_bytes_async (file, bytes, etag, make_backup, flags,
+      cancellable, callback, user_data);
+  g_bytes_unref (bytes);
+}
+
+/**
+ * g_file_replace_contents_bytes_async:
+ * @file: input #GFile
+ * @contents: a #GBytes
+ * @etag: (allow-none): a new [entity tag][gfile-etag] for the @file, or %NULL
+ * @make_backup: %TRUE if a backup should be created
+ * @flags: a set of #GFileCreateFlags
+ * @cancellable: optional #GCancellable object, %NULL to ignore
+ * @callback: a #GAsyncReadyCallback to call when the request is satisfied
+ * @user_data: the data to pass to callback function
+ *
+ * Same as g_file_replace_contents_async() but takes a #GBytes input instead.
+ * This function will keep a ref on @contents until the operation is done.
+ * Unlike g_file_replace_contents_async() this allows forgetting about the
+ * content without waiting for the callback.
+ *
+ * When this operation has completed, @callback will be called with
+ * @user_user data, and the operation can be finalized with
+ * g_file_replace_contents_finish().
+ *
+ * Since: 2.40
+ */
+void
+g_file_replace_contents_bytes_async  (GFile               *file,
+                                      GBytes              *contents,
+                                      const char          *etag,
+                                      gboolean             make_backup,
+                                      GFileCreateFlags     flags,
+                                      GCancellable        *cancellable,
+                                      GAsyncReadyCallback  callback,
+                                      gpointer             user_data)
 {
   ReplaceContentsData *data;
 
@@ -6888,88 +7372,353 @@ g_file_replace_contents_async  (GFile               *file,
 
   data = g_new0 (ReplaceContentsData, 1);
 
-  if (cancellable)
-    data->cancellable = g_object_ref (cancellable);
-  data->callback = callback;
-  data->user_data = user_data;
-  data->content = contents;
-  data->length = length;
-  data->pos = 0;
-  data->file = g_object_ref (file);
+  data->content = g_bytes_ref (contents);
+
+  data->task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (data->task, data, (GDestroyNotify)replace_contents_data_free);
 
   g_file_replace_async (file,
-                       etag,
-                       make_backup,
-                       flags,
-                       0,
-                       cancellable,
-                       replace_contents_open_callback,
-                       data);
+                        etag,
+                        make_backup,
+                        flags,
+                        0,
+                        g_task_get_cancellable (data->task),
+                        replace_contents_open_callback,
+                        data);
 }
-  
+
 /**
  * g_file_replace_contents_finish:
- * @file: input #GFile.
- * @res: a #GAsyncResult
- * @new_etag: (out) (allow-none): a location of a new <link linkend="gfile-etag">entity tag</link> 
- *     for the document. This should be freed with g_free() when it is no 
+ * @file: input #GFile
+ * @res: a #GAsyncResult
+ * @new_etag: (out) (allow-none): a location of a new [entity tag][gfile-etag]
+ *     for the document. This should be freed with g_free() when it is no
  *     longer needed, or %NULL
- * @error: a #GError, or %NULL 
- * 
+ * @error: a #GError, or %NULL
+ *
  * Finishes an asynchronous replace of the given @file. See
- * g_file_replace_contents_async(). Sets @new_etag to the new entity 
+ * g_file_replace_contents_async(). Sets @new_etag to the new entity
  * tag for the document, if present.
- * 
+ *
  * Returns: %TRUE on success, %FALSE on failure.
- **/
+ */
 gboolean
 g_file_replace_contents_finish (GFile         *file,
-                               GAsyncResult  *res,
-                               char         **new_etag,
-                               GError       **error)
+                                GAsyncResult  *res,
+                                char         **new_etag,
+                                GError       **error)
 {
-  GSimpleAsyncResult *simple;
+  GTask *task;
   ReplaceContentsData *data;
 
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
-  g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE);
+  g_return_val_if_fail (g_task_is_valid (res, file), FALSE);
 
-  simple = G_SIMPLE_ASYNC_RESULT (res);
+  task = G_TASK (res);
 
-  if (g_simple_async_result_propagate_error (simple, error))
+  if (!g_task_propagate_boolean (task, error))
     return FALSE;
-  
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_replace_contents_async);
-  
-  data = g_simple_async_result_get_op_res_gpointer (simple);
-
-  if (data->error)
-    {
-      g_propagate_error (error, data->error);
-      data->error = NULL;
-      return FALSE;
-    }
 
+  data = g_task_get_task_data (task);
 
   if (new_etag)
     {
       *new_etag = data->etag;
       data->etag = NULL; /* Take ownership */
     }
-  
+
+  return TRUE;
+}
+
+gboolean
+g_file_real_measure_disk_usage (GFile                         *file,
+                                GFileMeasureFlags              flags,
+                                GCancellable                  *cancellable,
+                                GFileMeasureProgressCallback   progress_callback,
+                                gpointer                       progress_data,
+                                guint64                       *disk_usage,
+                                guint64                       *num_dirs,
+                                guint64                       *num_files,
+                                GError                       **error)
+{
+  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                       "Operation not supported for the current backend.");
+  return FALSE;
+}
+
+typedef struct
+{
+  GFileMeasureFlags             flags;
+  GFileMeasureProgressCallback  progress_callback;
+  gpointer                      progress_data;
+} MeasureTaskData;
+
+typedef struct
+{
+  guint64 disk_usage;
+  guint64 num_dirs;
+  guint64 num_files;
+} MeasureResult;
+
+typedef struct
+{
+  GFileMeasureProgressCallback callback;
+  gpointer                     user_data;
+  gboolean                     reporting;
+  guint64                      current_size;
+  guint64                      num_dirs;
+  guint64                      num_files;
+} MeasureProgress;
+
+static gboolean
+measure_disk_usage_invoke_progress (gpointer user_data)
+{
+  MeasureProgress *progress = user_data;
+
+  (* progress->callback) (progress->reporting,
+                          progress->current_size, progress->num_dirs, progress->num_files,
+                          progress->user_data);
+
+  return FALSE;
+}
+
+static void
+measure_disk_usage_progress (gboolean reporting,
+                             guint64  current_size,
+                             guint64  num_dirs,
+                             guint64  num_files,
+                             gpointer user_data)
+{
+  MeasureProgress progress;
+  GTask *task = user_data;
+  MeasureTaskData *data;
+
+  data = g_task_get_task_data (task);
+
+  progress.callback = data->progress_callback;
+  progress.user_data = data->progress_data;
+  progress.reporting = reporting;
+  progress.current_size = current_size;
+  progress.num_dirs = num_dirs;
+  progress.num_files = num_files;
+
+  g_main_context_invoke_full (g_task_get_context (task),
+                              g_task_get_priority (task),
+                              measure_disk_usage_invoke_progress,
+                              g_memdup (&progress, sizeof progress),
+                              g_free);
+}
+
+static void
+measure_disk_usage_thread (GTask        *task,
+                           gpointer      source_object,
+                           gpointer      task_data,
+                           GCancellable *cancellable)
+{
+  MeasureTaskData *data = task_data;
+  GError *error = NULL;
+  MeasureResult result = { 0, };
+
+  if (g_file_measure_disk_usage (source_object, data->flags, cancellable,
+                                 data->progress_callback ? measure_disk_usage_progress : NULL, task,
+                                 &result.disk_usage, &result.num_dirs, &result.num_files,
+                                 &error))
+    g_task_return_pointer (task, g_memdup (&result, sizeof result), g_free);
+  else
+    g_task_return_error (task, error);
+}
+
+static void
+g_file_real_measure_disk_usage_async (GFile                        *file,
+                                      GFileMeasureFlags             flags,
+                                      gint                          io_priority,
+                                      GCancellable                 *cancellable,
+                                      GFileMeasureProgressCallback  progress_callback,
+                                      gpointer                      progress_data,
+                                      GAsyncReadyCallback           callback,
+                                      gpointer                      user_data)
+{
+  MeasureTaskData data;
+  GTask *task;
+
+  data.flags = flags;
+  data.progress_callback = progress_callback;
+  data.progress_data = progress_data;
+
+  task = g_task_new (file, cancellable, callback, user_data);
+  g_task_set_task_data (task, g_memdup (&data, sizeof data), g_free);
+  g_task_set_priority (task, io_priority);
+
+  g_task_run_in_thread (task, measure_disk_usage_thread);
+  g_object_unref (task);
+}
+
+static gboolean
+g_file_real_measure_disk_usage_finish (GFile         *file,
+                                       GAsyncResult  *result,
+                                       guint64       *disk_usage,
+                                       guint64       *num_dirs,
+                                       guint64       *num_files,
+                                       GError       **error)
+{
+  MeasureResult *measure_result;
+
+  g_return_val_if_fail (g_task_is_valid (result, file), FALSE);
+
+  measure_result = g_task_propagate_pointer (G_TASK (result), error);
+
+  if (measure_result == NULL)
+    return FALSE;
+
+  if (disk_usage)
+    *disk_usage = measure_result->disk_usage;
+
+  if (num_dirs)
+    *num_dirs = measure_result->num_dirs;
+
+  if (num_files)
+    *num_files = measure_result->num_files;
+
+  g_free (measure_result);
+
   return TRUE;
 }
 
 /**
+ * g_file_measure_disk_usage:
+ * @file: a #GFile
+ * @flags: #GFileMeasureFlags
+ * @cancellable: (allow-none): optional #GCancellable
+ * @progress_callback: (allow-none): a #GFileMeasureProgressCallback
+ * @progress_data: user_data for @progress_callback
+ * @disk_usage: (allow-none) (out): the number of bytes of disk space used
+ * @num_dirs: (allow-none) (out): the number of directories encountered
+ * @num_files: (allow-none) (out): the number of non-directories encountered
+ * @error: (allow-none): %NULL, or a pointer to a %NULL #GError pointer
+ *
+ * Recursively measures the disk usage of @file.
+ *
+ * This is essentially an analog of the 'du' command, but it also
+ * reports the number of directories and non-directory files encountered
+ * (including things like symbolic links).
+ *
+ * By default, errors are only reported against the toplevel file
+ * itself.  Errors found while recursing are silently ignored, unless
+ * %G_FILE_DISK_USAGE_REPORT_ALL_ERRORS is given in @flags.
+ *
+ * The returned size, @disk_usage, is in bytes and should be formatted
+ * with g_format_size() in order to get something reasonable for showing
+ * in a user interface.
+ *
+ * @progress_callback and @progress_data can be given to request
+ * periodic progress updates while scanning.  See the documentation for
+ * #GFileMeasureProgressCallback for information about when and how the
+ * callback will be invoked.
+ *
+ * Returns: %TRUE if successful, with the out parameters set.
+ *          %FALSE otherwise, with @error set.
+ *
+ * Since: 2.38
+ **/
+gboolean
+g_file_measure_disk_usage (GFile                         *file,
+                           GFileMeasureFlags              flags,
+                           GCancellable                  *cancellable,
+                           GFileMeasureProgressCallback   progress_callback,
+                           gpointer                       progress_data,
+                           guint64                       *disk_usage,
+                           guint64                       *num_dirs,
+                           guint64                       *num_files,
+                           GError                       **error)
+{
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  return G_FILE_GET_IFACE (file)->measure_disk_usage (file, flags, cancellable,
+                                                      progress_callback, progress_data,
+                                                      disk_usage, num_dirs, num_files,
+                                                      error);
+}
+
+/**
+ * g_file_measure_disk_usage_async:
+ * @file: a #GFile
+ * @flags: #GFileMeasureFlags
+ * @io_priority: the [I/O priority][io-priority] of the request
+ * @cancellable: (allow-none): optional #GCancellable
+ * @progress_callback: (allow-none): a #GFileMeasureProgressCallback
+ * @progress_data: user_data for @progress_callback
+ * @callback: (allow-none): a #GAsyncReadyCallback to call when complete
+ * @user_data: the data to pass to callback function
+ *
+ * Recursively measures the disk usage of @file.
+ *
+ * This is the asynchronous version of g_file_measure_disk_usage().  See
+ * there for more information.
+ *
+ * Since: 2.38
+ **/
+void
+g_file_measure_disk_usage_async (GFile                        *file,
+                                 GFileMeasureFlags             flags,
+                                 gint                          io_priority,
+                                 GCancellable                 *cancellable,
+                                 GFileMeasureProgressCallback  progress_callback,
+                                 gpointer                      progress_data,
+                                 GAsyncReadyCallback           callback,
+                                 gpointer                      user_data)
+{
+  g_return_if_fail (G_IS_FILE (file));
+  g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable));
+
+  G_FILE_GET_IFACE (file)->measure_disk_usage_async (file, flags, io_priority, cancellable,
+                                                     progress_callback, progress_data,
+                                                     callback, user_data);
+}
+
+/**
+ * g_file_measure_disk_usage_finish:
+ * @file: a #GFile
+ * @result: the #GAsyncResult passed to your #GAsyncReadyCallback
+ * @disk_usage: (allow-none) (out): the number of bytes of disk space used
+ * @num_dirs: (allow-none) (out): the number of directories encountered
+ * @num_files: (allow-none) (out): the number of non-directories encountered
+ * @error: (allow-none): %NULL, or a pointer to a %NULL #GError pointer
+ *
+ * Collects the results from an earlier call to
+ * g_file_measure_disk_usage_async().  See g_file_measure_disk_usage() for
+ * more information.
+ *
+ * Returns: %TRUE if successful, with the out parameters set.
+ *          %FALSE otherwise, with @error set.
+ *
+ * Since: 2.38
+ **/
+gboolean
+g_file_measure_disk_usage_finish (GFile         *file,
+                                  GAsyncResult  *result,
+                                  guint64       *disk_usage,
+                                  guint64       *num_dirs,
+                                  guint64       *num_files,
+                                  GError       **error)
+{
+  g_return_val_if_fail (G_IS_FILE (file), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  return G_FILE_GET_IFACE (file)->measure_disk_usage_finish (file, result, disk_usage, num_dirs, num_files, error);
+}
+
+/**
  * g_file_start_mountable:
- * @file: input #GFile.
+ * @file: input #GFile
  * @flags: flags affecting the operation
- * @start_operation: a #GMountOperation, or %NULL to avoid user interaction.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @callback: a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @start_operation: (allow-none): a #GMountOperation, or %NULL to avoid user interaction
+ * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore
+ * @callback: (allow-none): a #GAsyncReadyCallback to call when the request is satisfied, or %NULL
  * @user_data: the data to pass to callback function
  *
- * Starts a file of type G_FILE_TYPE_MOUNTABLE.
+ * Starts a file of type #G_FILE_TYPE_MOUNTABLE.
  * Using @start_operation, you can request callbacks when, for instance,
  * passwords are needed during authentication.
  *
@@ -6977,18 +7726,19 @@ g_file_replace_contents_finish (GFile         *file,
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_mount_mountable_finish() to get the result of the operation.
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_mount_mountable_finish() to get
+ * the result of the operation.
  *
  * Since: 2.22
  */
 void
-g_file_start_mountable (GFile                      *file,
-                        GDriveStartFlags            flags,
-                        GMountOperation            *start_operation,
-                        GCancellable               *cancellable,
-                        GAsyncReadyCallback         callback,
-                        gpointer                    user_data)
+g_file_start_mountable (GFile               *file,
+                        GDriveStartFlags     flags,
+                        GMountOperation     *start_operation,
+                        GCancellable        *cancellable,
+                        GAsyncReadyCallback  callback,
+                        gpointer             user_data)
 {
   GFileIface *iface;
 
@@ -6998,27 +7748,25 @@ g_file_start_mountable (GFile                      *file,
 
   if (iface->start_mountable == NULL)
     {
-      g_simple_async_report_error_in_idle (G_OBJECT (file),
-                                          callback,
-                                          user_data,
-                                          G_IO_ERROR,
-                                          G_IO_ERROR_NOT_SUPPORTED,
-                                          _("Operation not supported"));
+      g_task_report_new_error (file, callback, user_data,
+                               g_file_start_mountable,
+                               G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                               _("Operation not supported"));
       return;
     }
 
   (* iface->start_mountable) (file,
-                             flags,
-                             start_operation,
-                             cancellable,
-                             callback,
-                             user_data);
+                              flags,
+                              start_operation,
+                              cancellable,
+                              callback,
+                              user_data);
 }
 
 /**
  * g_file_start_mountable_finish:
- * @file: input #GFile.
- * @result: a #GAsyncResult.
+ * @file: input #GFile
+ * @result: a #GAsyncResult
  * @error: a #GError, or %NULL
  *
  * Finishes a start operation. See g_file_start_mountable() for details.
@@ -7032,21 +7780,19 @@ g_file_start_mountable (GFile                      *file,
  * Since: 2.22
  */
 gboolean
-g_file_start_mountable_finish (GFile                      *file,
-                               GAsyncResult               *result,
-                               GError                    **error)
+g_file_start_mountable_finish (GFile         *file,
+                               GAsyncResult  *result,
+                               GError       **error)
 {
   GFileIface *iface;
 
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (result))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return FALSE;
-    }
+  if (g_async_result_legacy_propagate_error (result, error))
+    return FALSE;
+  else if (g_async_result_is_tagged (result, g_file_start_mountable))
+    return g_task_propagate_boolean (G_TASK (result), error);
 
   iface = G_FILE_GET_IFACE (file);
   return (* iface->start_mountable_finish) (file, result, error);
@@ -7054,31 +7800,35 @@ g_file_start_mountable_finish (GFile                      *file,
 
 /**
  * g_file_stop_mountable:
- * @file: input #GFile.
+ * @file: input #GFile
  * @flags: flags affecting the operation
- * @mount_operation: a #GMountOperation, or %NULL to avoid user interaction.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @callback: a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @mount_operation: (allow-none): a #GMountOperation,
+ *     or %NULL to avoid user interaction.
+ * @cancellable: (allow-none): optional #GCancellable object,
+ *     %NULL to ignore
+ * @callback: (allow-none): a #GAsyncReadyCallback to call
+ *     when the request is satisfied, or %NULL
  * @user_data: the data to pass to callback function
  *
- * Stops a file of type G_FILE_TYPE_MOUNTABLE.
+ * Stops a file of type #G_FILE_TYPE_MOUNTABLE.
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_stop_mountable_finish() to get the result of the operation.
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_stop_mountable_finish() to get
+ * the result of the operation.
  *
  * Since: 2.22
  */
 void
-g_file_stop_mountable (GFile                      *file,
-                       GMountUnmountFlags          flags,
-                       GMountOperation            *mount_operation,
-                       GCancellable               *cancellable,
-                       GAsyncReadyCallback         callback,
-                       gpointer                    user_data)
+g_file_stop_mountable (GFile               *file,
+                       GMountUnmountFlags   flags,
+                       GMountOperation     *mount_operation,
+                       GCancellable        *cancellable,
+                       GAsyncReadyCallback  callback,
+                       gpointer             user_data)
 {
   GFileIface *iface;
 
@@ -7088,12 +7838,10 @@ g_file_stop_mountable (GFile                      *file,
 
   if (iface->stop_mountable == NULL)
     {
-      g_simple_async_report_error_in_idle (G_OBJECT (file),
-                                          callback,
-                                          user_data,
-                                          G_IO_ERROR,
-                                          G_IO_ERROR_NOT_SUPPORTED,
-                                          _("Operation not supported"));
+      g_task_report_new_error (file, callback, user_data,
+                               g_file_stop_mountable,
+                               G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                               _("Operation not supported"));
       return;
     }
 
@@ -7107,8 +7855,8 @@ g_file_stop_mountable (GFile                      *file,
 
 /**
  * g_file_stop_mountable_finish:
- * @file: input #GFile.
- * @result: a #GAsyncResult.
+ * @file: input #GFile
+ * @result: a #GAsyncResult
  * @error: a #GError, or %NULL
  *
  * Finishes an stop operation, see g_file_stop_mountable() for details.
@@ -7116,27 +7864,25 @@ g_file_stop_mountable (GFile                      *file,
  * Finish an asynchronous stop operation that was started
  * with g_file_stop_mountable().
  *
- * Returns: %TRUE if the operation finished successfully. %FALSE
- * otherwise.
+ * Returns: %TRUE if the operation finished successfully.
+ *     %FALSE otherwise.
  *
  * Since: 2.22
  */
 gboolean
-g_file_stop_mountable_finish (GFile                      *file,
-                              GAsyncResult               *result,
-                              GError                    **error)
+g_file_stop_mountable_finish (GFile         *file,
+                              GAsyncResult  *result,
+                              GError       **error)
 {
   GFileIface *iface;
 
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (result))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return FALSE;
-    }
+  if (g_async_result_legacy_propagate_error (result, error))
+    return FALSE;
+  else if (g_async_result_is_tagged (result, g_file_stop_mountable))
+    return g_task_propagate_boolean (G_TASK (result), error);
 
   iface = G_FILE_GET_IFACE (file);
   return (* iface->stop_mountable_finish) (file, result, error);
@@ -7144,27 +7890,29 @@ g_file_stop_mountable_finish (GFile                      *file,
 
 /**
  * g_file_poll_mountable:
- * @file: input #GFile.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @callback: a #GAsyncReadyCallback to call when the request is satisfied, or %NULL.
+ * @file: input #GFile
+ * @cancellable: optional #GCancellable object, %NULL to ignore
+ * @callback: (allow-none): a #GAsyncReadyCallback to call
+ *     when the request is satisfied, or %NULL
  * @user_data: the data to pass to callback function
  *
- * Polls a file of type G_FILE_TYPE_MOUNTABLE.
+ * Polls a file of type #G_FILE_TYPE_MOUNTABLE.
  *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
  *
- * When the operation is finished, @callback will be called. You can then call
- * g_file_mount_mountable_finish() to get the result of the operation.
+ * When the operation is finished, @callback will be called.
+ * You can then call g_file_mount_mountable_finish() to get
+ * the result of the operation.
  *
  * Since: 2.22
  */
 void
-g_file_poll_mountable (GFile                      *file,
-                       GCancellable               *cancellable,
-                       GAsyncReadyCallback         callback,
-                       gpointer                    user_data)
+g_file_poll_mountable (GFile               *file,
+                       GCancellable        *cancellable,
+                       GAsyncReadyCallback  callback,
+                       gpointer             user_data)
 {
   GFileIface *iface;
 
@@ -7174,12 +7922,10 @@ g_file_poll_mountable (GFile                      *file,
 
   if (iface->poll_mountable == NULL)
     {
-      g_simple_async_report_error_in_idle (G_OBJECT (file),
-                                          callback,
-                                          user_data,
-                                          G_IO_ERROR,
-                                          G_IO_ERROR_NOT_SUPPORTED,
-                                          _("Operation not supported"));
+      g_task_report_new_error (file, callback, user_data,
+                               g_file_poll_mountable,
+                               G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                               _("Operation not supported"));
       return;
     }
 
@@ -7191,8 +7937,8 @@ g_file_poll_mountable (GFile                      *file,
 
 /**
  * g_file_poll_mountable_finish:
- * @file: input #GFile.
- * @result: a #GAsyncResult.
+ * @file: input #GFile
+ * @result: a #GAsyncResult
  * @error: a #GError, or %NULL
  *
  * Finishes a poll operation. See g_file_poll_mountable() for details.
@@ -7206,21 +7952,19 @@ g_file_poll_mountable (GFile                      *file,
  * Since: 2.22
  */
 gboolean
-g_file_poll_mountable_finish (GFile                      *file,
-                              GAsyncResult               *result,
-                              GError                    **error)
+g_file_poll_mountable_finish (GFile         *file,
+                              GAsyncResult  *result,
+                              GError       **error)
 {
   GFileIface *iface;
 
   g_return_val_if_fail (G_IS_FILE (file), FALSE);
   g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
-  if (G_IS_SIMPLE_ASYNC_RESULT (result))
-    {
-      GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-      if (g_simple_async_result_propagate_error (simple, error))
-       return FALSE;
-    }
+  if (g_async_result_legacy_propagate_error (result, error))
+    return FALSE;
+  else if (g_async_result_is_tagged (result, g_file_poll_mountable))
+    return g_task_propagate_boolean (G_TASK (result), error);
 
   iface = G_FILE_GET_IFACE (file);
   return (* iface->poll_mountable_finish) (file, result, error);
@@ -7228,13 +7972,12 @@ g_file_poll_mountable_finish (GFile                      *file,
 
 /**
  * g_file_supports_thread_contexts:
- * @file: a #GFile.
+ * @file: a #GFile
  *
- * Checks if @file supports <link
- * linkend="g-main-context-push-thread-default-context">thread-default
- * contexts</link>. If this returns %FALSE, you cannot perform
- * asynchronous operations on @file in a thread that has a
- * thread-default context.
+ * Checks if @file supports
+ * [thread-default contexts][g-main-context-push-thread-default-context].
+ * If this returns %FALSE, you cannot perform asynchronous operations on
+ * @file in a thread that has a thread-default context.
  *
  * Returns: Whether or not @file supports thread-default contexts.
  *