aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy/empathy-tp-file.c8
-rw-r--r--libempathy/empathy-tp-file.h1
-rw-r--r--src/empathy-ft-manager.c2
3 files changed, 2 insertions, 9 deletions
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index 23f7c8c41..a53bb23fe 100644
--- 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 8f4b915f4..1d4443153 100644
--- 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 d3d22fbd8..87531f0fe 100644
--- 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