tubes: call the function directly

Change-Id: Ic9f02f7df77fabaec585c3f53bf0a86044bf27bb

3 files changed, 4 insertions, 25 deletions

diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 06ff54342596..7c895e4dac22 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -152,9 +152,6 @@ public:
     /** Only the callback of prepareAccountManager() is to set this. */
     void                    setAccountManagerReady( bool bPrepared);
 
-    /** Iterate our GMainLoop, blocking, unconditionally. */
-    void                    iterateLoop();
-
     typedef bool (*CallBackInvokedFunc)();
     /** Iterate our GMainLoop, blocking, until the callback is done. */
     void                    iterateLoop( CallBackInvokedFunc pFunc );
@@ -163,10 +160,6 @@ public:
     /** Iterate our GMainLoop, blocking, until the callback is done. */
     void                    iterateLoop( ManagerCallBackInvokedFunc pFunc );
 
-    typedef bool (TeleConference::*ConferenceCallBackInvokedFunc)() const;
-    /** Iterate our GMainLoop, blocking, until the callback is done. */
-    void                    iterateLoop( const TeleConference* pConference, ConferenceCallBackInvokedFunc pFunc );
-
     /// "LibreOfficeWhatEver"
     static rtl::OString     getFullClientName();
 
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
index 3d1bd0a0cb84..c1592bfe3763 100644
--- a/tubes/source/conference.cxx
+++ b/tubes/source/conference.cxx
@@ -273,7 +273,10 @@ void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChanne
 
 bool TeleConference::spinUntilTubeEstablished()
 {
-    mpManager->iterateLoop( this, &TeleConference::isTubeOfferedHandlerInvoked);
+    while (!isTubeOfferedHandlerInvoked())
+    {
+        g_main_context_iteration( NULL, TRUE );
+    }
 
     bool bOpen = pImpl->mpTube != NULL;
     SAL_INFO( "tubes", "TeleConference::spinUntilTubeEstablished: tube open: " << bOpen);
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index e07db6397c5c..ae79e5afed30 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -925,13 +925,6 @@ rtl::OString TeleManager::getFullObjectPath()
     return aStr;
 }
 
-
-void TeleManager::iterateLoop()
-{
-    g_main_context_iteration( NULL, TRUE );
-}
-
-
 void TeleManager::iterateLoop( CallBackInvokedFunc pFunc )
 {
     while (!(*pFunc)())
@@ -949,16 +942,6 @@ void TeleManager::iterateLoop( ManagerCallBackInvokedFunc pFunc )
     }
 }
 
-
-void TeleManager::iterateLoop( const TeleConference* pConference, ConferenceCallBackInvokedFunc pFunc )
-{
-    while (!(pConference->*pFunc)())
-    {
-        g_main_context_iteration( NULL, TRUE );
-    }
-}
-
-
 // static
 rtl::OString TeleManager::createUuid()
 {