aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy/empathy-client-factory.c6
-rw-r--r--libempathy/empathy-ft-factory.c2
-rw-r--r--nautilus-sendto-plugin/empathy-nautilus-sendto.c3
-rw-r--r--src/empathy-event-manager.c7
-rw-r--r--src/empathy-ft-manager.c5
5 files changed, 7 insertions, 16 deletions
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index f7529bf2e..3794ef60d 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -24,7 +24,6 @@
#include "empathy-client-factory.h"
#include "empathy-tp-chat.h"
-#include "empathy-tp-file.h"
#include "empathy-utils.h"
#include <telepathy-yell/telepathy-yell.h>
@@ -89,11 +88,6 @@ empathy_client_factory_create_channel (TpSimpleClientFactory *factory,
return TP_CHANNEL (call_channel_new_with_factory (
TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error));
}
- else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
- {
- return TP_CHANNEL (empathy_tp_file_new (
- TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error));
- }
return chainup->create_channel (factory, conn, path, properties, error);
}
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index fa52ce1aa..10c8bea08 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -182,7 +182,7 @@ handle_channels_cb (TpSimpleHandler *handler,
if (tp_proxy_get_invalidated (channel) != NULL)
continue;
- if (!EMPATHY_IS_TP_FILE (channel))
+ if (!TP_IS_FILE_TRANSFER_CHANNEL (channel))
continue;
/* We handle only incoming FT */
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 2f38b8325..ee1519de3 100644
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -33,7 +33,6 @@
#include <libempathy/empathy-debug.h>
#include <libempathy/empathy-ft-factory.h>
#include <libempathy/empathy-ft-handler.h>
-#include <libempathy/empathy-tp-file.h>
#include <libempathy-gtk/empathy-contact-chooser.h>
#include <libempathy-gtk/empathy-ui-utils.h>
@@ -166,7 +165,7 @@ quit (void)
static void
transfer_done_cb (EmpathyFTHandler *handler,
- EmpathyTpFile *tp_file,
+ TpFileTransferChannel *channel,
NstPlugin *plugin)
{
quit ();
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 5d2f659f2..bc15262a1 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;