summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2015-08-17 23:56:35 +0200
committerCarlos Soriano <csoriano@gnome.org>2015-08-18 00:05:46 +0200
commit893ce0bbd6eb53e814d2c239c920cee2e63d5b5e (patch)
treebd85a8e50899bcc266f184932088b730b7c46c4e /client
parentec6317e000007759ef22e497ae55f50cf15de8ae (diff)
downloadgvfs-893ce0bbd6eb53e814d2c239c920cee2e63d5b5e.tar.gz
gdaemonfile: check for the correct cancellable
We were checking for the newly created data cancellable, which is wrong. That was causing that mounting encloused volumes were not cancellable at all. Check for the actual GCancellable parameter to fix it. https://bugzilla.gnome.org/show_bug.cgi?id=753735
Diffstat (limited to 'client')
-rw-r--r--client/gdaemonfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
index cc9edea8..41f975c9 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -2074,7 +2074,7 @@ g_daemon_file_mount_enclosing_volume (GFile *location,
data = g_new0 (MountData, 1);
data->callback = callback;
- if (data->cancellable)
+ if (cancellable)
data->cancellable = g_object_ref (data->cancellable);
data->user_data = user_data;
data->file = g_object_ref (location);