Merge remote-tracking branch 'jonny/ft'

[empathy.git] / src / empathy-ft-manager.c

diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 606600e990aad239801bdbd1a848e86f7a817e26..18ca1938a3e57041a9eb6ba70b09ee61f1f382f4 100644 (file)
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -37,7 +37,6 @@
 
 #define DEBUG_FLAG EMPATHY_DEBUG_FT
 #include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-tp-file.h>
 #include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
@@ -518,7 +517,7 @@ do_real_transfer_done (EmpathyFTManager *manager,
 
 static void
 ft_handler_transfer_done_cb (EmpathyFTHandler *handler,
-                             EmpathyTpFile *tp_file,
+                             TpFileTransferChannel *channel,
                              EmpathyFTManager *manager)
 {
   if (empathy_ft_handler_is_incoming (handler) &&
@@ -574,7 +573,7 @@ ft_handler_transfer_progress_cb (EmpathyFTHandler *handler,
 
 static void
 ft_handler_transfer_started_cb (EmpathyFTHandler *handler,
-                                EmpathyTpFile *tp_file,
+                                TpFileTransferChannel *channel,
                                 EmpathyFTManager *manager)
 {
   guint64 transferred_bytes, total_bytes;