diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-04 22:14:08 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-04 22:51:36 +0200 |
| commit | b3da63d28fedeee9306fb2c44ffd85271408fa7d (patch) | |
| tree | 3439a0bc9e8e253215c01f2e9840dba30e85d16e /tubes/source | |
| parent | ee1b41dcc2fd00c9b45c7a7a7e2357c2c9c23ed5 (diff) | |
tubes: avoid boost::signaling received packets
Change-Id: I63e262aa05ec7c06c15eaf74201b6ac1966e2e56
Diffstat (limited to 'tubes/source')
| -rw-r--r-- | tubes/source/conference.cxx | 8 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx index 6203685a5b1b..4eaaf8cd8d8e 100644 --- a/tubes/source/conference.cxx +++ b/tubes/source/conference.cxx @@ -27,9 +27,11 @@ */ #include <tubes/conference.hxx> -#include <tubes/manager.hxx> + +#include <tubes/collaboration.hxx> #include <tubes/constants.h> #include <tubes/file-transfer-helper.h> +#include <tubes/manager.hxx> #include <telepathy-glib/telepathy-glib.h> #include <queue> @@ -230,6 +232,7 @@ static void TeleConference_TubeAcceptedHandler( TeleConference::TeleConference( TpAccount* pAccount, TpDBusTubeChannel* pChannel, const OString sUuid, bool bMaster ) : + mpCollaboration( NULL ), mpAccount( NULL ), mpChannel( NULL ), msUuid( sUuid ), @@ -461,7 +464,8 @@ void TeleConference::queue( const OString &rPacket ) pImpl->maPacketQueue.push( rPacket); - sigPacketReceived( rPacket ); + if (mpCollaboration) + mpCollaboration->PacketReceived( rPacket ); } diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 6c9007ad72b9..fd00cd05191f 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -236,7 +236,7 @@ void TeleManager::broadcastPacket( const OString& rPacket ) INFO_LOGGER_F( "TeleManager::broadcastPacket" ); for (TeleManagerImpl::DemoConferences::iterator it = pImpl->maDemoConferences.begin(); it != pImpl->maDemoConferences.end(); ++it) - (*it)->sigPacketReceived( rPacket ); + (*it)->queue( rPacket ); } bool TeleManager::hasWaitingConference() @@ -296,7 +296,7 @@ static void TeleManager_TransferDone( EmpathyFTHandler *handler, TpFileTransferC SAL_INFO( "tubes", "TeleManager_TransferDone: hooray!"); GFile *gfile = empathy_ft_handler_get_gfile( handler); char *uri = g_file_get_uri( gfile); - rtl::OUString aUri( uri, strlen( uri), RTL_TEXTENCODING_UTF8); + rtl::OUString aUri( OUString::createFromAscii( uri ) ); g_free( uri); TeleManager_fileReceived( aUri ); |