projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Rework kdbus core files
[platform/upstream/glib.git]
/
gio
/
gunixvolume.c
diff --git
a/gio/gunixvolume.c
b/gio/gunixvolume.c
index
0ebcda7
..
981f703
100644
(file)
--- a/
gio/gunixvolume.c
+++ b/
gio/gunixvolume.c
@@
-309,7
+309,10
@@
eject_mount_do (GVolume *volume,
task = g_task_new (volume, cancellable, callback, user_data);
if (g_task_return_error_if_cancelled (task))
task = g_task_new (volume, cancellable, callback, user_data);
if (g_task_return_error_if_cancelled (task))
- return;
+ {
+ g_object_unref (task);
+ return;
+ }
subprocess = g_subprocess_newv (argv, G_SUBPROCESS_FLAGS_STDOUT_SILENCE | G_SUBPROCESS_FLAGS_STDERR_PIPE, &error);
g_assert_no_error (error);
subprocess = g_subprocess_newv (argv, G_SUBPROCESS_FLAGS_STDOUT_SILENCE | G_SUBPROCESS_FLAGS_STDERR_PIPE, &error);
g_assert_no_error (error);
@@
-343,7
+346,9
@@
g_unix_volume_mount_finish (GVolume *volume,
GAsyncResult *result,
GError **error)
{
GAsyncResult *result,
GError **error)
{
- return TRUE;
+ g_return_val_if_fail (g_task_is_valid (result, volume), FALSE);
+
+ return g_task_propagate_boolean (G_TASK (result), error);
}
static void
}
static void
@@
-366,7
+371,9
@@
g_unix_volume_eject_finish (GVolume *volume,
GAsyncResult *result,
GError **error)
{
GAsyncResult *result,
GError **error)
{
- return TRUE;
+ g_return_val_if_fail (g_task_is_valid (result, volume), FALSE);
+
+ return g_task_propagate_boolean (G_TASK (result), error);
}
static gchar *
}
static gchar *