[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source tubes/source

[Michael Meeks]

 sc/source/ui/collab/sendfunc.cxx |    4 +++-
 tubes/source/manager.cxx         |    3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 95a53ef4250708759a5631d98b2f567dceeb8750
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Mar 23 14:10:36 2012 +0000

    tubes: calm debug thrash and get master connections right.

diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 771ee8b..1026d9b 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -523,9 +523,11 @@ SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc()
                 LINK( pReceiver, ScDocFuncRecv, ReceiverCallback),
                 LINK( pReceiver, ScDocFuncRecv, ReceiveFileCallback) );
         bOk = bOk && pCollab->initManager();
-        bOk = bOk && pCollab->initAccountContact();
         if (!strcmp( pEnv, "master"))
+        {
+            bOk = bOk && pCollab->initAccountContact();
             bOk = bOk && pCollab->startCollaboration();
+        }
         if (bOk)
         {
             pReceiver->SetCollaboration( pCollab);
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 74145ec..f9ca143 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -874,7 +874,6 @@ void TeleManager::iterateLoop( CallBackInvokedFunc pFunc )
     GMainContext* pContext = getMainContext();
     while (!(*pFunc)())
     {
-        SAL_INFO( "tubes.loop", "TeleManager::iterateLoop: CallBackInvokedFunc");
         g_main_context_iteration( pContext, TRUE);
     }
 }
@@ -885,7 +884,6 @@ void TeleManager::iterateLoop( ManagerCallBackInvokedFunc pFunc )
     GMainContext* pContext = getMainContext();
     while (!(this->*pFunc)())
     {
-        SAL_INFO( "tubes.loop", "TeleManager::iterateLoop: ManagerCallBackInvokedFunc");
         g_main_context_iteration( pContext, TRUE);
     }
 }
@@ -896,7 +894,6 @@ void TeleManager::iterateLoop( const TeleConference* pConference, ConferenceCall
     GMainContext* pContext = getMainContext();
     while (!(pConference->*pFunc)())
     {
-        SAL_INFO( "tubes.loop", "TeleManager::iterateLoop: ConferenceCallBackInvokedFunc");
         g_main_context_iteration( pContext, TRUE);
     }
 }