diff options
author | Will Thompson <will.thompson@collabora.co.uk> | 2012-03-23 15:40:25 +0000 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:39:54 +0200 |
commit | a210def83b6e9cdab90222f1d39d8a25cbac4a90 (patch) | |
tree | 7e43899837adb8f6cb6eb7be04ea2d30705ca5de /tubes | |
parent | 679c4df0da586adfec342e9b0084953dacbc9791 (diff) |
tubes: delete MainLoopFlusher
This doesn't actually seem to have any effect on the test passing or
failing.
Diffstat (limited to 'tubes')
-rw-r--r-- | tubes/inc/tubes/manager.hxx | 28 | ||||
-rw-r--r-- | tubes/source/manager.cxx | 16 |
2 files changed, 0 insertions, 44 deletions
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 3d557ad5b458..defb4f9ec262 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -238,34 +238,6 @@ private: }; -/** The most ugly workaround for not having a GMainLoop running, i.e. in - cppunittest. - */ -class MainLoopFlusher -{ -public: - explicit MainLoopFlusher( const TeleManager* pManager ) - : - mpManager( pManager) - { - flush(); - } - - ~MainLoopFlusher() - { - flush(); - } - - void flush() const - { - mpManager->flushLoop(); - } - -private: - const TeleManager* mpManager; -}; - - #endif // INCLUDED_TUBES_MANAGER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 87f1f119b2b7..8a4c0c68ed0b 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -394,8 +394,6 @@ bool TeleManager::connect() MutexGuard aGuard( GetMutex()); - MainLoopFlusher aFlusher( this); - /* TODO: also check whether client could be registered and retry if not? */ SAL_INFO_IF( pImpl->mpDBus && pImpl->mpClient, "tubes", "TeleManager::connect: already connected"); if (pImpl->mpDBus && pImpl->mpClient) @@ -510,8 +508,6 @@ bool TeleManager::startGroupSession( const rtl::OUString& rUConferenceRoom, cons { INFO_LOGGER( "TeleManager::startGroupSession"); - MainLoopFlusher aFlusher( this); - if (!getMyAccount()) return false; @@ -574,8 +570,6 @@ bool TeleManager::startBuddySession( TpAccount *pAccount, TpContact *pBuddy ) { INFO_LOGGER( "TeleManager::startBuddySession"); - MainLoopFlusher aFlusher( this); - OString aSessionId( TeleManager::createUuid()); TeleConferencePtr pConference( new TeleConference( this, NULL, NULL, aSessionId)); @@ -622,8 +616,6 @@ void TeleManager::prepareAccountManager() MutexGuard aGuard( GetMutex()); - MainLoopFlusher aFlusher( this); - SAL_INFO_IF( pImpl->meAccountManagerStatus == AMS_PREPARED, "tubes", "TeleManager::prepareAccountManager: already prepared"); if (pImpl->meAccountManagerStatus == AMS_PREPARED) @@ -677,8 +669,6 @@ TpAccount* TeleManager::getAccount( const rtl::OString& rAccountID ) { INFO_LOGGER( "TeleManager::getMyAccount"); - MainLoopFlusher aFlusher( this); - SAL_WARN_IF( pImpl->meAccountManagerStatus != AMS_PREPARED, "tubes", "TeleManager::getMyAccount: Account Manager not prepared"); if (pImpl->meAccountManagerStatus != AMS_PREPARED) @@ -715,8 +705,6 @@ sal_uInt32 TeleManager::sendPacket( const TelePacket& rPacket ) const { INFO_LOGGER( "TeleManager::sendPacket"); - MainLoopFlusher aFlusher( this); - sal_uInt32 nSent = 0; // Access to data ByteStream array forces reference count of one, provide // non-const instance here before passing it down to each conference. @@ -785,8 +773,6 @@ void TeleManager::disconnect() { INFO_LOGGER( "TeleManager::disconnect"); - //! No MainLoopFlusher here! - if (!pImpl->mpClient) return; @@ -818,8 +804,6 @@ void TeleManager::acceptTube( TpAccount* pAccount, TpChannel* pChannel, const ch SAL_INFO( "tubes", "TeleManager::acceptTube: address " << pAddress); - MainLoopFlusher aFlusher( this); - SAL_WARN_IF( !pChannel || !pAddress, "tubes", "TeleManager::acceptTube: no channel or no address"); if (!pChannel || !pAddress) return; |