diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 11:55:39 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 15:59:19 +0200 |
| commit | bb9399e2cf0072d1de7cb0aea162d107ebde4360 (patch) | |
| tree | 217696157c18ed2a291845191cc60e2b39bbf9d8 /desktop | |
| parent | c55b2d0b32dd210c2a809ce2b5ebca12bfb5b1d8 (diff) | |
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
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 8582af50ba95..6d5ea30b08c2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -624,8 +624,7 @@ Desktop::Desktop() Desktop::~Desktop() { #ifdef ENABLE_TELEPATHY - if (m_pTeleManager) - m_pTeleManager->unref(); + delete m_pTeleManager; #endif } @@ -1708,7 +1707,7 @@ int Desktop::Main() SetSplashScreenProgress(60); #ifdef ENABLE_TELEPATHY - m_pTeleManager = TeleManager::get(); + m_pTeleManager = new TeleManager(); bool bListen = rCmdLineArgs.IsInvisible(); m_pTeleManager->init( bListen ); #endif |