diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 17:56:12 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 22:15:58 +0200 |
| commit | df2369657ebe36c3888bb032e693bf1fcb49bb51 (patch) | |
| tree | 9aaf358dde0a0b139cc8ea0738410fb144c1f772 /tubes/source | |
| parent | 4eed899c596fdcb777ccb0a59c72718c6b2c295d (diff) | |
tubes: send file when inviting contact to MUC collaboration
- add UUID info to TeleConference
- let SendFile function take argument for contact instead of getting
contact from the channel info, what couldn't work for MUC channel
Change-Id: I4dc45c084966a030ff4b503e192d452797f0bfdd
Diffstat (limited to 'tubes/source')
| -rw-r--r-- | tubes/source/conference.cxx | 4 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx index d28ffc34aabf..bc2dc753f91f 100644 --- a/tubes/source/conference.cxx +++ b/tubes/source/conference.cxx @@ -510,7 +510,7 @@ static void TeleConference_FTReady( EmpathyFTHandler *handler, GError *error, gp } -void TeleConference::sendFile( rtl::OUString &localUri, FileSentCallback pCallback, void* pUserData) +void TeleConference::sendFile( TpContact* pContact, rtl::OUString &localUri, FileSentCallback pCallback, void* pUserData) { INFO_LOGGER( "TeleConference::sendFile"); @@ -524,7 +524,7 @@ void TeleConference::sendFile( rtl::OUString &localUri, FileSentCallback pCallba SendFileRequest *pReq = new SendFileRequest( pCallback, pUserData); empathy_ft_handler_new_outgoing( mpAccount, - tp_channel_get_target_contact( TP_CHANNEL( mpChannel)), + pContact, pSource, 0, TeleConference_FTReady, pReq); diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 9df5468e80b8..c0f742719321 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -221,6 +221,7 @@ void TeleManager_TransferDone( EmpathyFTHandler *handler, TpFileTransferChannel sal_Int32 first = aUri.indexOf('_'); sal_Int32 last = aUri.lastIndexOf('_'); + SAL_WARN_IF( first == last, "tubes", "No UUID to associate with the file!" ); if (first != last) { OString sUuid( OUStringToOString( aUri.copy( first + 1, last - first - 1), @@ -600,7 +601,7 @@ TeleConference* TeleManager::startGroupSession( TpAccount *pAccount, setChannelReadyHandlerInvoked( false); - TeleConference* pConference = new TeleConference( this, NULL, NULL ); + TeleConference* pConference = new TeleConference( this, NULL, NULL, aSessionId ); tp_account_channel_request_create_and_handle_channel_async( pChannelRequest, NULL, TeleManager_ChannelReadyHandler, pConference); |