diff options
author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-11-09 18:54:03 +0800 |
---|---|---|
committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-11-09 18:54:03 +0800 |
commit | 9635473089accaa52a98242964cda0580a7f820d (patch) | |
tree | 600da3ff1fe20293da25e35b4c1e66caec2b4734 /src/empathy-event-manager.c | |
parent | 984f97edbd102cfab9ecad00c07cb9ac6474ffc9 (diff) | |
download | gsoc2013-empathy-9635473089accaa52a98242964cda0580a7f820d.tar gsoc2013-empathy-9635473089accaa52a98242964cda0580a7f820d.tar.gz gsoc2013-empathy-9635473089accaa52a98242964cda0580a7f820d.tar.bz2 gsoc2013-empathy-9635473089accaa52a98242964cda0580a7f820d.tar.lz gsoc2013-empathy-9635473089accaa52a98242964cda0580a7f820d.tar.xz gsoc2013-empathy-9635473089accaa52a98242964cda0580a7f820d.tar.zst gsoc2013-empathy-9635473089accaa52a98242964cda0580a7f820d.zip |
client-factory: stop creating EmpathyTpFile objects
TpAutomaticClientFactory will create TpFileTransferChannels for us and
they're, like, way better.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src/empathy-event-manager.c')
-rw-r--r-- | src/empathy-event-manager.c | 7 |
1 files changed, 3 insertions, 4 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; |