Removed empathy_tp_file_close as it was a duplicate of _cancel.

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

diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index 23f7c8c41c661a034a0dfebef216bca5e3ff8aac..a53bb23fe8e8eda3b92b057ac3d29ea4cdb606dc 100644 (file)
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -585,7 +585,7 @@ tp_file_got_contact_cb (EmpathyTpContactFactory *factory,
   if (error)
     {
       DEBUG ("Error: %s", error->message);
-      empathy_tp_file_close (tp_file);
+      empathy_tp_file_cancel (tp_file);
       return;
     }
 
@@ -1162,12 +1162,6 @@ empathy_tp_file_cancel (EmpathyTpFile *tp_file)
     g_cancellable_cancel (tp_file->priv->cancellable);
 }
 
-void
-empathy_tp_file_close (EmpathyTpFile *tp_file)
-{
-  empathy_tp_file_cancel (tp_file);
-}
-
 /**
  * empathy_tp_file_is_ready:
  * @tp_file: an #EmpathyTpFile

diff --git a/libempathy/empathy-tp-file.h b/libempathy/empathy-tp-file.h
index 8f4b915f4ddda94c06c9915724eb61950869f39b..1d444315325c5225a46535876c72595ae81559d3 100644 (file)
--- a/libempathy/empathy-tp-file.h
+++ b/libempathy/empathy-tp-file.h
@@ -69,7 +69,6 @@ TpChannel *empathy_tp_file_get_channel (EmpathyTpFile *tp_file);
 void empathy_tp_file_accept (EmpathyTpFile *tp_file, guint64 offset,
   GFile *gfile, GError **error);
 void empathy_tp_file_cancel (EmpathyTpFile *tp_file);
-void empathy_tp_file_close (EmpathyTpFile *tp_file);
 void empathy_tp_file_offer (EmpathyTpFile *tp_file, GFile *gfile,
   GError **error);
 

diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index d3d22fbd8917fc203f80fd170617e7d8d2096ae7..87531f0fe72266fa7f250c3229a169094c9a4086 100644 (file)
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -447,7 +447,7 @@ ft_manager_remove_file_from_model (EmpathyFTManager *ft_manager,
   if (update_selection)
     gtk_tree_selection_select_iter (selection, &iter);
 
-  empathy_tp_file_close (tp_file);
+  empathy_tp_file_cancel (tp_file);
 }
 
 static gboolean