diff options
| -rw-r--r-- | tubes/inc/tubes/conference.hxx | 3 | ||||
| -rw-r--r-- | tubes/source/conference.cxx | 3 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 8 |
3 files changed, 5 insertions, 9 deletions
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx index 6841f9a406b1..b5ca996751c1 100644 --- a/tubes/inc/tubes/conference.hxx +++ b/tubes/inc/tubes/conference.hxx @@ -48,7 +48,7 @@ class TeleConference : public boost::enable_shared_from_this<TeleConference> { public: - TeleConference( TeleManager* pManager, TpAccount *pAccount, TpDBusTubeChannel* pChannel, const rtl::OString& rSessionId ); + TeleConference( TeleManager* pManager, TpAccount *pAccount, TpDBusTubeChannel* pChannel ); ~TeleConference(); /// Close channel and call finalize() @@ -106,7 +106,6 @@ private: bool spinUntilTubeEstablished(); bool setTube( GDBusConnection* pTube); - rtl::OString maSessionId; TeleManager* mpManager; TpAccount* mpAccount; TpDBusTubeChannel* mpChannel; diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx index 3df23c6db198..458063ba1f08 100644 --- a/tubes/source/conference.cxx +++ b/tubes/source/conference.cxx @@ -201,9 +201,8 @@ void TeleConference::TubeAcceptedHandler( } -TeleConference::TeleConference( TeleManager* pManager, TpAccount* pAccount, TpDBusTubeChannel* pChannel, const rtl::OString& rSessionId ) +TeleConference::TeleConference( TeleManager* pManager, TpAccount* pAccount, TpDBusTubeChannel* pChannel ) : - maSessionId( rSessionId ), mpManager( pManager), mpAccount( NULL), mpChannel( NULL), diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 14df6e1208f1..944d33a9b503 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -124,7 +124,7 @@ void TeleManager::DBusChannelHandler( SAL_INFO( "tubes", "accepting"); aAccepted = true; - TeleConferencePtr pConference( new TeleConference( pManager, pAccount, TP_DBUS_TUBE_CHANNEL( pChannel), "")); + TeleConferencePtr pConference( new TeleConference( pManager, pAccount, TP_DBUS_TUBE_CHANNEL( pChannel ) ) ); pManager->maConferences.push_back( pConference); pConference->acceptTube(); } @@ -514,7 +514,7 @@ bool TeleManager::startGroupSession( TpAccount *pAccount, OString aSessionId( TeleManager::createUuid()); - TeleConferencePtr pConference( new TeleConference( this, NULL, NULL, aSessionId)); + TeleConferencePtr pConference( new TeleConference( this, NULL, NULL ) ); maConferences.push_back( pConference); /* TODO: associate the document with this session and conference */ @@ -604,9 +604,7 @@ bool TeleManager::startBuddySession( TpAccount *pAccount, TpContact *pBuddy ) ensureLegacyChannel( pAccount, pBuddy ); - OString aSessionId( TeleManager::createUuid()); - - TeleConferencePtr pConference( new TeleConference( this, NULL, NULL, aSessionId)); + TeleConferencePtr pConference( new TeleConference( this, NULL, NULL ) ); maConferences.push_back( pConference); /* TODO: associate the document with this session and conference */ |