aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2008-11-22 00:15:32 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:15:32 +0800
commitc3ae7279ecee96a63c9d4132ee2bd2f5a30ca1da (patch)
tree6dd4c22aeb6f3916c816d7e8906663f30d55e021
parent2e207fd6076574f895026a611abe9188332dd81c (diff)
downloadgsoc2013-empathy-c3ae7279ecee96a63c9d4132ee2bd2f5a30ca1da.tar
gsoc2013-empathy-c3ae7279ecee96a63c9d4132ee2bd2f5a30ca1da.tar.gz
gsoc2013-empathy-c3ae7279ecee96a63c9d4132ee2bd2f5a30ca1da.tar.bz2
gsoc2013-empathy-c3ae7279ecee96a63c9d4132ee2bd2f5a30ca1da.tar.lz
gsoc2013-empathy-c3ae7279ecee96a63c9d4132ee2bd2f5a30ca1da.tar.xz
gsoc2013-empathy-c3ae7279ecee96a63c9d4132ee2bd2f5a30ca1da.tar.zst
gsoc2013-empathy-c3ae7279ecee96a63c9d4132ee2bd2f5a30ca1da.zip
Changed order of closing channel and cancelling socket transfers. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> svn path=/trunk/; revision=1764
-rw-r--r--libempathy/empathy-file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy/empathy-file.c b/libempathy/empathy-file.c
index ffab4d2ea..491cf87cb 100644
--- a/libempathy/empathy-file.c
+++ b/libempathy/empathy-file.c
@@ -898,9 +898,9 @@ empathy_file_cancel (EmpathyFile *file)
priv = GET_PRIV (file);
- g_cancellable_cancel (priv->cancellable);
-
tp_cli_channel_run_close (priv->channel, -1, NULL, NULL);
+
+ g_cancellable_cancel (priv->cancellable);
}
void