diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 12:00:35 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:32 +0200 |
| commit | ce9bc65e125cff96e53e37116a5475260f773535 (patch) | |
| tree | 5ab943ad8cf4e2793afb4a8d4ac59a87f79978e1 | |
| parent | tubes: reintroduced handling of extending formats in ScViewFunc::EnterData() (diff) | |
| download | core-ce9bc65e125cff96e53e37116a5475260f773535.tar.gz core-ce9bc65e125cff96e53e37116a5475260f773535.zip | |
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
| -rw-r--r-- | tubes/source/manager.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
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<TeleManager*>(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); } |