diff options
| author | Ondrej Holy <oholy@redhat.com> | 2016-06-14 17:09:44 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2017-03-28 12:17:41 +0200 |
| commit | 76242c7f2747569dfacc13ba781fed9823978848 (patch) | |
| tree | c4d25f0d5dc4805950583341f06d7fb04e4e74e9 /client | |
| parent | 847787159f65cc612f3e4aee634c4bb127e9da96 (diff) | |
| download | gvfs-76242c7f2747569dfacc13ba781fed9823978848.tar.gz | |
client: Remove obsolete GSimpleAsyncResult helpers
GSimpleAsyncResult is deprecated in favour of GTask and should be replaced.
https://bugzilla.gnome.org/show_bug.cgi?id=747412
Diffstat (limited to 'client')
| -rw-r--r-- | client/gvfsdaemondbus.c | 32 | ||||
| -rw-r--r-- | client/gvfsdaemondbus.h | 6 |
2 files changed, 0 insertions, 38 deletions
diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c index 0bf47b1f..e12d2936 100644 --- a/client/gvfsdaemondbus.c +++ b/client/gvfsdaemondbus.c @@ -609,30 +609,6 @@ _g_dbus_connection_get_sync (const char *dbus_id, return connection; } -/** - * _g_simple_async_result_complete_with_cancellable: - * @result: the result - * @cancellable: a cancellable to check - * - * If @cancellable is cancelled, sets @result into the cancelled error - * state. Then calls g_simple_async_result_complete(). - * This function is useful to ensure that @result is properly set into - * an error state on cancellation. - **/ -void -_g_simple_async_result_complete_with_cancellable (GSimpleAsyncResult *result, - GCancellable *cancellable) -{ - if (cancellable && - g_cancellable_is_cancelled (cancellable)) - g_simple_async_result_set_error (result, - G_IO_ERROR, - G_IO_ERROR_CANCELLED, - "%s", _("Operation was cancelled")); - - g_simple_async_result_complete (result); -} - void _g_propagate_error_stripped (GError **dest, GError *src) { @@ -640,11 +616,3 @@ _g_propagate_error_stripped (GError **dest, GError *src) if (dest && *dest) g_dbus_error_strip_remote_error (*dest); } - -void -_g_simple_async_result_take_error_stripped (GSimpleAsyncResult *simple, - GError *error) -{ - g_dbus_error_strip_remote_error (error); - g_simple_async_result_take_error (simple, error); -} diff --git a/client/gvfsdaemondbus.h b/client/gvfsdaemondbus.h index bd02d417..70237dc2 100644 --- a/client/gvfsdaemondbus.h +++ b/client/gvfsdaemondbus.h @@ -55,12 +55,6 @@ void _g_dbus_connection_get_for_async (const char GVfsAsyncDBusCallback callback, gpointer callback_data, GCancellable *cancellable); -void _g_simple_async_result_complete_with_cancellable - (GSimpleAsyncResult *result, - GCancellable *cancellable); -void _g_simple_async_result_take_error_stripped - (GSimpleAsyncResult *simple, - GError *error); gulong _g_dbus_async_subscribe_cancellable (GDBusConnection *connection, GCancellable *cancellable); |