tubes: add a shared TeleManager singleton

Yes, this is in addition to the existing TeleManagerImpl singleton. This
class needs to be properly split in half: one Manager part from which
the UI can request new sessions and which signals the appearance of new
incoming sessions, and another Session part representing the shared
editing session (which in turn owns one or more Conferences, which owns
exactly one tube, as now).  The Manager will dispatch incoming files to
the appropriate Conference by UUID or similar.

But for now, Michael is opening a new window with the received file,
so we want incoming and outgoing events to go to both windows so that it
works well enough for a demo.

sc/source/ui/collab/collab.cxx

@@ -47,7 +47,9 @@ ScCollaboration::~ScCollaboration()
         g_object_unref( mpAccount);
     if (mpContact)
         g_object_unref( mpContact);
-    delete mpManager;
+
+    mpManager->unref();
+    mpManager = NULL;
 }
 
 
@@ -75,13 +77,13 @@ void ScCollaboration::packetReceivedCallback( TeleConference *pConference )
 
 bool ScCollaboration::initManager()
 {
-    mpManager = new TeleManager();
+    mpManager = TeleManager::get();
     mpManager->sigPacketReceived.connect(
         boost::bind( &ScCollaboration::packetReceivedCallback, this, _1 ));
-    bool bOk = mpManager->connect();
+    mpManager->connect();
     mpManager->prepareAccountManager();
     mpManager->setFileReceivedCallback( file_recv_cb, (void *)this );
-    return bOk;
+    return true;
 }
 
 

tubes/inc/tubes/manager.hxx

@@ -80,6 +80,9 @@ public:
     TeleManager( bool bCreateOwnGMainLoop = false );
     ~TeleManager();
 
+    static TeleManager     *get();
+    void                    unref();
+
     /** Prepare the Telepathy Account Manager. Requires connect() to have succeeded.
 
         Invokes an async call that is not ready until meAccountManagerStatus is
@@ -227,13 +230,19 @@ private:
     static sal_uInt32       nRefCount;
     static rtl::OString     aNameSuffix;
 
+    /* FIXME: double-singletonning is bad. These two are used by ::get and
+     * ::unref, and are a quick hack so that we can have a demo working.
+     */
+    static TeleManager*     pSingleton;
+    static sal_uInt32       nAnotherRefCount;
+    TUBES_DLLPRIVATE static ::osl::Mutex&   GetAnotherMutex();
+
     FileReceivedCallback    mpFileReceivedCallback;
     void                   *mpFileReceivedCallbackData;
 
     friend class TeleManagerImpl;   // access to mutex
 
     TUBES_DLLPRIVATE static ::osl::Mutex&   GetMutex();
-
 };
 
 

tubes/source/manager.cxx

@@ -70,6 +70,9 @@ TeleManagerImpl* TeleManager::pImpl     = NULL;
 sal_uInt32       TeleManager::nRefCount = 0;
 rtl::OString     TeleManager::aNameSuffix;
 
+sal_uInt32       TeleManager::nAnotherRefCount = 0;
+TeleManager*     TeleManager::pSingleton = NULL;
+
 
 /** Refcounted singleton implementation class. */
 class TeleManagerImpl
@@ -386,6 +389,27 @@ TeleManager::~TeleManager()
     }
 }
 
+TeleManager *
+TeleManager::get()
+{
+    MutexGuard aGuard( GetAnotherMutex());
+    if (!pSingleton)
+        pSingleton = new TeleManager();
+
+    nAnotherRefCount++;
+    return pSingleton;
+}
+
+void
+TeleManager::unref()
+{
+    MutexGuard aGuard( GetAnotherMutex());
+    if (--nAnotherRefCount == 0) {
+        delete pSingleton;
+        pSingleton = NULL;
+    }
+}
+
 
 bool TeleManager::connect()
 {
@@ -931,6 +955,18 @@ Mutex& TeleManager::GetMutex()
     return *pMutex;
 }
 
+Mutex& TeleManager::GetAnotherMutex()
+{
+    static Mutex* pMutex = NULL;
+    if (!pMutex)
+    {
+        MutexGuard aGuard( Mutex::getGlobalMutex());
+        if (!pMutex)
+            pMutex = new Mutex;
+    }
+    return *pMutex;
+}
+
 
 // static
 void TeleManager::addSuffixToNames( const char* pName )