tubes: kill double-singletonning of TeleManager

I am not sure why it was introduced in
0dae49a03c9b4816d8cdde69e30bcd2db2e30724
and hope that it's safe to remove it now.

Change-Id: I62f0ac230a83473386eabc45c9fcc387f62631e3

1 files changed, 2 insertions, 11 deletions

diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 0e96826337da..163b58eb6228 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -72,11 +72,9 @@ public:
     /** Prepare tube manager with account and service to be offered/listened
         to.
      */
-    TeleManager();
-    ~TeleManager();
+    TUBES_DLLPUBLIC                         TeleManager();
+    TUBES_DLLPUBLIC                         ~TeleManager();
 
-    TUBES_DLLPUBLIC static TeleManager*     get();
-    TUBES_DLLPUBLIC void                    unref();
     TUBES_DLLPUBLIC bool                    init( bool bListen );
 
     /** Connect to DBus and create AccountManager. */
@@ -197,13 +195,6 @@ 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;
-    static ::osl::Mutex&    GetAnotherMutex();
-
     friend class TeleManagerImpl;   // access to mutex
 
     static ::osl::Mutex&    GetMutex();