gio: fix a leftover GSimpleAsyncResult usage

And remove remaining unnecessary gsimpleasyncresult.h includes

13 files changed, 6 insertions, 17 deletions

diff --git a/gio/gconverterinputstream.c b/gio/gconverterinputstream.c
index 7e22aaaf6..d23b8f269 100644
--- a/gio/gconverterinputstream.c
+++ b/gio/gconverterinputstream.c
@@ -24,7 +24,6 @@
 
 #include "gconverterinputstream.h"
 #include "gpollableinputstream.h"
-#include "gsimpleasyncresult.h"
 #include "gcancellable.h"
 #include "gioenumtypes.h"
 #include "gioerror.h"
diff --git a/gio/gconverteroutputstream.c b/gio/gconverteroutputstream.c
index 6e17d5596..46616b1a4 100644
--- a/gio/gconverteroutputstream.c
+++ b/gio/gconverteroutputstream.c
@@ -24,7 +24,6 @@
 
 #include "gconverteroutputstream.h"
 #include "gpollableoutputstream.h"
-#include "gsimpleasyncresult.h"
 #include "gcancellable.h"
 #include "gioenumtypes.h"
 #include "gioerror.h"
diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
index 5755e74fb..1a287f36e 100644
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.c
@@ -27,7 +27,6 @@
 #include "gioenumtypes.h"
 #include "ginitable.h"
 #include "gasyncresult.h"
-#include "gsimpleasyncresult.h"
 #include "gasyncinitable.h"
 #include "gdbusconnection.h"
 #include "gdbusutils.h"
diff --git a/gio/gdummytlsbackend.c b/gio/gdummytlsbackend.c
index 9b390965e..b47f71ea4 100644
--- a/gio/gdummytlsbackend.c
+++ b/gio/gdummytlsbackend.c
@@ -31,7 +31,6 @@
 #include "gtlsdatabase.h"
 #include "gtlsfiledatabase.h"
 #include "gtlsserverconnection.h"
-#include "gsimpleasyncresult.h"
 
 #include "giomodule.h"
 #include "giomodule-priv.h"
diff --git a/gio/gpermission.c b/gio/gpermission.c
index 0fcd17ec7..ee5fc0c12 100644
--- a/gio/gpermission.c
+++ b/gio/gpermission.c
@@ -24,7 +24,7 @@
 #include "gioerror.h"
 #include "gioenums.h"
 #include "gasyncresult.h"
-#include "gsimpleasyncresult.h"
+#include "gtask.h"
 #include "glibintl.h"
 
 
@@ -406,10 +406,11 @@ acquire_or_release_async (GPermission         *permission,
                           GAsyncReadyCallback  callback,
                           gpointer             user_data)
 {
-  g_simple_async_report_error_in_idle (G_OBJECT (permission),
-                                       callback, user_data,
-                                       G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                                       "Can't acquire or release permission");
+  g_task_report_new_error (permission,
+                           callback, user_data,
+                           NULL,
+                           G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                           "Can't acquire or release permission");
 }
 
 static gboolean
diff --git a/gio/gproxyresolver.c b/gio/gproxyresolver.c
index eb3552f60..d5b19fdfd 100644
--- a/gio/gproxyresolver.c
+++ b/gio/gproxyresolver.c
@@ -29,7 +29,6 @@
 #include "gcancellable.h"
 #include "giomodule.h"
 #include "giomodule-priv.h"
-#include "gsimpleasyncresult.h"
 
 /**
  * SECTION:gproxyresolver
diff --git a/gio/gresolver.c b/gio/gresolver.c
index a6b12d613..d5387c0d9 100644
--- a/gio/gresolver.c
+++ b/gio/gresolver.c
@@ -26,7 +26,6 @@
 #include "gnetworkingprivate.h"
 #include "gasyncresult.h"
 #include "ginetaddress.h"
-#include "gsimpleasyncresult.h"
 #include "gtask.h"
 #include "gsrvtarget.h"
 #include "gthreadedresolver.h"
diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c
index 24700ece8..660111e0d 100644
--- a/gio/gunixinputstream.c
+++ b/gio/gunixinputstream.c
@@ -31,7 +31,6 @@
 #include <glib/gstdio.h>
 #include <glib/glib-unix.h>
 #include "gioerror.h"
-#include "gsimpleasyncresult.h"
 #include "gunixinputstream.h"
 #include "gcancellable.h"
 #include "gasynchelper.h"
diff --git a/gio/gunixmount.c b/gio/gunixmount.c
index 2ec8e5cbf..216f8ed55 100644
--- a/gio/gunixmount.c
+++ b/gio/gunixmount.c
@@ -39,7 +39,6 @@
 #include "gfile.h"
 #include "gvolumemonitor.h"
 #include "gthemedicon.h"
-#include "gsimpleasyncresult.h"
 #include "gioerror.h"
 #include "glibintl.h"
 /* for BUFSIZ */
diff --git a/gio/gunixoutputstream.c b/gio/gunixoutputstream.c
index 8aa7292b5..4b5519b6f 100644
--- a/gio/gunixoutputstream.c
+++ b/gio/gunixoutputstream.c
@@ -33,7 +33,6 @@
 #include "gioerror.h"
 #include "gunixoutputstream.h"
 #include "gcancellable.h"
-#include "gsimpleasyncresult.h"
 #include "gasynchelper.h"
 #include "gfiledescriptorbased.h"
 #include "glibintl.h"
diff --git a/gio/gwin32inputstream.c b/gio/gwin32inputstream.c
index 179e13991..bf60e6881 100644
--- a/gio/gwin32inputstream.c
+++ b/gio/gwin32inputstream.c
@@ -27,7 +27,6 @@
 
 #include <glib.h>
 #include "gioerror.h"
-#include "gsimpleasyncresult.h"
 #include "gwin32inputstream.h"
 #include "giowin32-priv.h"
 #include "gcancellable.h"
diff --git a/gio/gwin32mount.c b/gio/gwin32mount.c
index 5ae80c85c..b3d51ef8c 100644
--- a/gio/gwin32mount.c
+++ b/gio/gwin32mount.c
@@ -35,7 +35,6 @@
 #include "gmountprivate.h"
 #include "gvolumemonitor.h"
 #include "gthemedicon.h"
-#include "gsimpleasyncresult.h"
 #include "glibintl.h"
 
 
diff --git a/gio/gwin32outputstream.c b/gio/gwin32outputstream.c
index f69212b10..eea90ee27 100644
--- a/gio/gwin32outputstream.c
+++ b/gio/gwin32outputstream.c
@@ -31,7 +31,6 @@
 #include "gwin32outputstream.h"
 #include "giowin32-priv.h"
 #include "gcancellable.h"
-#include "gsimpleasyncresult.h"
 #include "gasynchelper.h"
 #include "glibintl.h"