tubes: delete MainLoopFlusher

This doesn't actually seem to have any effect on the test passing or
failing.

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;