Kaydet (Commit) aa8d62ed authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Matúš Kukan

tubes: calm debug thrash and get master connections right.

üst e3ac5ac2
...@@ -523,9 +523,11 @@ SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc() ...@@ -523,9 +523,11 @@ SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc()
LINK( pReceiver, ScDocFuncRecv, ReceiverCallback), LINK( pReceiver, ScDocFuncRecv, ReceiverCallback),
LINK( pReceiver, ScDocFuncRecv, ReceiveFileCallback) ); LINK( pReceiver, ScDocFuncRecv, ReceiveFileCallback) );
bOk = bOk && pCollab->initManager(); bOk = bOk && pCollab->initManager();
bOk = bOk && pCollab->initAccountContact();
if (!strcmp( pEnv, "master")) if (!strcmp( pEnv, "master"))
{
bOk = bOk && pCollab->initAccountContact();
bOk = bOk && pCollab->startCollaboration(); bOk = bOk && pCollab->startCollaboration();
}
if (bOk) if (bOk)
{ {
pReceiver->SetCollaboration( pCollab); pReceiver->SetCollaboration( pCollab);
......
...@@ -874,7 +874,6 @@ void TeleManager::iterateLoop( CallBackInvokedFunc pFunc ) ...@@ -874,7 +874,6 @@ void TeleManager::iterateLoop( CallBackInvokedFunc pFunc )
GMainContext* pContext = getMainContext(); GMainContext* pContext = getMainContext();
while (!(*pFunc)()) while (!(*pFunc)())
{ {
SAL_INFO( "tubes.loop", "TeleManager::iterateLoop: CallBackInvokedFunc");
g_main_context_iteration( pContext, TRUE); g_main_context_iteration( pContext, TRUE);
} }
} }
...@@ -885,7 +884,6 @@ void TeleManager::iterateLoop( ManagerCallBackInvokedFunc pFunc ) ...@@ -885,7 +884,6 @@ void TeleManager::iterateLoop( ManagerCallBackInvokedFunc pFunc )
GMainContext* pContext = getMainContext(); GMainContext* pContext = getMainContext();
while (!(this->*pFunc)()) while (!(this->*pFunc)())
{ {
SAL_INFO( "tubes.loop", "TeleManager::iterateLoop: ManagerCallBackInvokedFunc");
g_main_context_iteration( pContext, TRUE); g_main_context_iteration( pContext, TRUE);
} }
} }
...@@ -896,7 +894,6 @@ void TeleManager::iterateLoop( const TeleConference* pConference, ConferenceCall ...@@ -896,7 +894,6 @@ void TeleManager::iterateLoop( const TeleConference* pConference, ConferenceCall
GMainContext* pContext = getMainContext(); GMainContext* pContext = getMainContext();
while (!(pConference->*pFunc)()) while (!(pConference->*pFunc)())
{ {
SAL_INFO( "tubes.loop", "TeleManager::iterateLoop: ConferenceCallBackInvokedFunc");
g_main_context_iteration( pContext, TRUE); g_main_context_iteration( pContext, TRUE);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment