[glib/danw/fixes: 5/5] gio: fix a leftover GSimpleAsyncResult usage
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/danw/fixes: 5/5] gio: fix a leftover GSimpleAsyncResult usage
- Date: Sat, 8 Aug 2015 14:39:16 +0000 (UTC)
commit a8eedd00a726483cd29a2a5c9660c82438a5d57e
Author: Dan Winship <danw gnome org>
Date: Fri Aug 7 09:48:27 2015 -0400
gio: fix a leftover GSimpleAsyncResult usage
And remove remaining unnecessary gsimpleasyncresult.h includes
gio/gconverterinputstream.c | 1 -
gio/gconverteroutputstream.c | 1 -
gio/gdbusobjectmanagerclient.c | 1 -
gio/gdummytlsbackend.c | 1 -
gio/gpermission.c | 11 ++++++-----
gio/gproxyresolver.c | 1 -
gio/gresolver.c | 1 -
gio/gunixinputstream.c | 1 -
gio/gunixmount.c | 1 -
gio/gunixoutputstream.c | 1 -
gio/gwin32inputstream.c | 1 -
gio/gwin32mount.c | 1 -
gio/gwin32outputstream.c | 1 -
13 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/gio/gconverterinputstream.c b/gio/gconverterinputstream.c
index 7e22aaa..d23b8f2 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 6e17d55..46616b1 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 5755e74..1a287f3 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 9b39096..b47f71e 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 0fcd17e..ee5fc0c 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 eb3552f..d5b19fd 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 a6b12d6..d5387c0 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 24700ec..660111e 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 2ec8e5c..216f8ed 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 8aa7292..4b5519b 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 179e139..bf60e68 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 5ae80c8..b3d51ef 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 f69212b..eea90ee 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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]