summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorHans Petter Jansson <hpj@novell.com>2008-03-12 12:21:15 +0000
committerHans Petter <hansp@src.gnome.org>2008-03-12 12:21:15 +0000
commit79c3980575577951e2ecac4f4ec368e8c718be85 (patch)
treecfe28efa03e25b5f9b61ba9f9bf5c56e5dd10023 /client
parent75c211d916152108be7b5ce54513472ec80ba6b8 (diff)
downloadgvfs-79c3980575577951e2ecac4f4ec368e8c718be85.tar.gz
We were testing the wrong cancellable pointer for non-NULL-ness, which
2008-03-12 Hans Petter Jansson <hpj@novell.com> * client/gdaemonfile.c (do_async_path_call): We were testing the wrong cancellable pointer for non-NULL-ness, which broke cancellation for all async operations. Fix that. svn path=/trunk/; revision=1646
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 29808a91..b6106aac 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -639,7 +639,7 @@ do_async_path_call (GFile *file,
data->file = g_object_ref (file);
data->op = g_strdup (op);
- if (data->cancellable)
+ if (cancellable)
data->cancellable = g_object_ref (cancellable);
data->callback = callback;
data->callback_data = callback_data;