empathy r1889 - trunk/libempathy

[xclaesse svn gnome org]

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

Log:
Simplify a little bit the code when abording a FT

Modified:
   trunk/libempathy/empathy-tp-file.c

Modified: trunk/libempathy/empathy-tp-file.c
==============================================================================
--- trunk/libempathy/empathy-tp-file.c	(original)
+++ trunk/libempathy/empathy-tp-file.c	Fri Nov 21 16:23:38 2008
@@ -397,7 +397,7 @@
   if (fd < 0)
     {
       DEBUG ("Failed to create socket, closing channel");
-      tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL, NULL, NULL);
+      empathy_tp_file_cancel (tp_file);
       return;
     }
 
@@ -409,7 +409,7 @@
   if (connect (fd, (struct sockaddr*) &addr, sizeof (addr)) < 0)
     {
       DEBUG ("Failed to connect socket, closing channel");
-      tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL, NULL, NULL);
+      empathy_tp_file_cancel (tp_file);
       close (fd);
       return;
     }
@@ -709,7 +709,7 @@
   if (error)
     {
       DEBUG ("Error: %s", error->message);
-      tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL, NULL, NULL);
+      empathy_tp_file_cancel (tp_file);
       return;
     }
 
@@ -869,7 +869,8 @@
 
   tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL, NULL, NULL);
 
-  g_cancellable_cancel (tp_file->priv->cancellable);
+  if (tp_file->priv->cancellable != NULL)
+    g_cancellable_cancel (tp_file->priv->cancellable);
 }
 
 static void