summaryrefslogtreecommitdiff
path: root/tubes/source
diff options
context:
space:
mode:
Diffstat (limited to 'tubes/source')
-rw-r--r--tubes/source/conference.cxx5
-rw-r--r--tubes/source/manager.cxx17
2 files changed, 4 insertions, 18 deletions
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()
{