aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-file.c
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-11-22 00:15:32 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-11-22 00:15:32 +0800
commitfdaad54b5f6f6ee4aca92e63666bb7dd6fc7b79e (patch)
tree6dd4c22aeb6f3916c816d7e8906663f30d55e021 /libempathy/empathy-file.c
parent4d799c24d9574b7000e001de6add9288bb5b9817 (diff)
downloadgsoc2013-empathy-fdaad54b5f6f6ee4aca92e63666bb7dd6fc7b79e.tar
gsoc2013-empathy-fdaad54b5f6f6ee4aca92e63666bb7dd6fc7b79e.tar.gz
gsoc2013-empathy-fdaad54b5f6f6ee4aca92e63666bb7dd6fc7b79e.tar.bz2
gsoc2013-empathy-fdaad54b5f6f6ee4aca92e63666bb7dd6fc7b79e.tar.lz
gsoc2013-empathy-fdaad54b5f6f6ee4aca92e63666bb7dd6fc7b79e.tar.xz
gsoc2013-empathy-fdaad54b5f6f6ee4aca92e63666bb7dd6fc7b79e.tar.zst
gsoc2013-empathy-fdaad54b5f6f6ee4aca92e63666bb7dd6fc7b79e.zip
Changed order of closing channel and cancelling socket transfers. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@1764 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy/empathy-file.c')
-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