aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-04-25 05:36:11 +0800
committerJonny Lamb <jonny.lamb@collabora.co.uk>2009-04-25 05:36:11 +0800
commit18e765fd857e0767aa43b4c6dc459c4a49216e18 (patch)
treee0b6f09ce37328f4412578fb8b4f768254e511c4 /libempathy
parent359783484982228a9e7b87749910afc93b04a919 (diff)
downloadgsoc2013-empathy-18e765fd857e0767aa43b4c6dc459c4a49216e18.tar
gsoc2013-empathy-18e765fd857e0767aa43b4c6dc459c4a49216e18.tar.gz
gsoc2013-empathy-18e765fd857e0767aa43b4c6dc459c4a49216e18.tar.bz2
gsoc2013-empathy-18e765fd857e0767aa43b4c6dc459c4a49216e18.tar.lz
gsoc2013-empathy-18e765fd857e0767aa43b4c6dc459c4a49216e18.tar.xz
gsoc2013-empathy-18e765fd857e0767aa43b4c6dc459c4a49216e18.tar.zst
gsoc2013-empathy-18e765fd857e0767aa43b4c6dc459c4a49216e18.zip
Removed empathy_tp_file_close as it was a duplicate of _cancel.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-file.c8
-rw-r--r--libempathy/empathy-tp-file.h1
2 files changed, 1 insertions, 8 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);