diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-event-manager.c | 7 | ||||
| -rw-r--r-- | src/empathy-ft-manager.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index da677d42d..c42b82821 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -36,7 +36,6 @@ #include <libempathy/empathy-contact-manager.h> #include <libempathy/empathy-tp-chat.h> #include <libempathy/empathy-tp-streamed-media.h> -#include <libempathy/empathy-tp-file.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-gsettings.h> @@ -422,9 +421,9 @@ reject_channel_claim_cb (GObject *source, { empathy_tp_chat_leave (user_data, ""); } - else if (EMPATHY_IS_TP_FILE (user_data)) + else if (TP_IS_FILE_TRANSFER_CHANNEL (user_data)) { - empathy_tp_file_close (user_data); + tp_channel_close_async (user_data, NULL, NULL); } out: @@ -1115,7 +1114,7 @@ approve_channels (TpSimpleApprover *approver, event_manager_call_channel_got_contact_cb, approval, NULL, G_OBJECT (self)); } - else if (EMPATHY_IS_TP_FILE (channel)) + else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER) { TpHandle handle; diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c index 606600e99..18ca1938a 100644 --- 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; |