diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-04 19:48:06 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-04 22:51:34 +0200 |
| commit | 525b1ad345ab04eb56e69cb67c38df1229897d83 (patch) | |
| tree | 65492e1cda7abef99ae19c054ce2935c75e53d4f /tubes/source | |
| parent | 8b3596bccdb4b3aa252c5d4a7db96cbff57632f5 (diff) | |
tubes: call the function directly
Change-Id: Ic9f02f7df77fabaec585c3f53bf0a86044bf27bb
Diffstat (limited to 'tubes/source')
| -rw-r--r-- | tubes/source/conference.cxx | 5 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 17 |
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() { |