diff options
author | Will Thompson <will.thompson@collabora.co.uk> | 2012-03-23 08:53:21 +0000 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:39:39 +0200 |
commit | e6a3874108e77d366085a4b275ac337cda5225ea (patch) | |
tree | 450026e4761086757d3f98747c8438cb800a40de /tubes/source/conference.cxx | |
parent | 0b7f8fb6971ca1df6f94508e45c42cdb157e3dab (diff) |
tubes: implement receiving files.
Diffstat (limited to 'tubes/source/conference.cxx')
-rw-r--r-- | tubes/source/conference.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx index 9a35c70e9a19..88ec817a3170 100644 --- a/tubes/source/conference.cxx +++ b/tubes/source/conference.cxx @@ -479,7 +479,7 @@ static void TeleConference_TransferError( EmpathyFTHandler *handler, const GErro g_object_unref (handler); } -static void TeleConference_FTReady( EmpathyFTHandler *handler, GError *error, gpointer user_data) +void TeleConference::FTReady( EmpathyFTHandler *handler, GError *error, gpointer user_data) { SendFileRequest *request = reinterpret_cast<SendFileRequest *>(user_data); @@ -495,6 +495,7 @@ static void TeleConference_FTReady( EmpathyFTHandler *handler, GError *error, gp G_CALLBACK (TeleConference_TransferDone), request); g_signal_connect(handler, "transfer-error", G_CALLBACK (TeleConference_TransferError), request); + empathy_ft_handler_set_service_name(handler, request->mpSelf->mpManager->getFullServiceName().getStr()); empathy_ft_handler_start_transfer(handler); } } @@ -517,7 +518,7 @@ void TeleConference::sendFile( rtl::OUString &localUri, FileSentCallback pCallba tp_channel_get_target_contact( mpChannel), pSource, 0, - &TeleConference_FTReady, pReq); + &TeleConference::FTReady, pReq); } |