empathy r1764 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Nov 21 16:15:32 2008
New Revision: 1764
URL: http://svn.gnome.org/viewvc/empathy?rev=1764&view=rev

Log:
Changed order of closing channel and cancelling socket transfers. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy/empathy-file.c

Modified: trunk/libempathy/empathy-file.c
==============================================================================
--- trunk/libempathy/empathy-file.c	(original)
+++ trunk/libempathy/empathy-file.c	Fri Nov 21 16:15:32 2008
@@ -898,9 +898,9 @@
 
   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