From ce9bc65e125cff96e53e37116a5475260f773535 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Tue, 17 Jul 2012 12:00:35 +0200 Subject: tubes: do not freeze when preparing Account Manager We don't need to wait for our capabilities update to propagate from one account via the network and back. Since e3d1001c08d255c588ed6ca93f3b58b2161cce45 ContactList returns all online contacts regardless of its capabilities. Change-Id: Icf8982dd1e6aedec4f21920ff8020f8547d7b855 --- tubes/source/manager.cxx | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'tubes') diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 896fcc8c0cf3..a01d2673b4c3 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -287,14 +287,6 @@ static void TeleManager_ChannelReadyHandler( pConference->offerTube(); } -static gboolean caps_hack_timeout_cb (void *pUserData) -{ - TeleManager* pManager = reinterpret_cast(pUserData); - - pManager->setAccountManagerReadyHandlerInvoked( true); - return FALSE; -} - static void TeleManager_AccountManagerReadyHandler( GObject* pSourceObject, GAsyncResult* pResult, @@ -308,10 +300,6 @@ static void TeleManager_AccountManagerReadyHandler( if (!pManager) return; - // Hack - // pManager->setAccountManagerReadyHandlerInvoked( true); - g_timeout_add_seconds( 2, caps_hack_timeout_cb, pManager); - GError* pError = NULL; gboolean bPrepared = tp_proxy_prepare_finish( pSourceObject, pResult, &pError); SAL_WARN_IF( !bPrepared, "tubes", "TeleManager_AccountManagerReadyHandler: not prepared"); @@ -322,6 +310,7 @@ static void TeleManager_AccountManagerReadyHandler( } pManager->setAccountManagerReady( bPrepared); + pManager->setAccountManagerReadyHandlerInvoked( true); } -- cgit