summaryrefslogtreecommitdiff
path: root/tubes/qa
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-07-26 11:55:39 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-07-26 15:59:19 +0200
commitbb9399e2cf0072d1de7cb0aea162d107ebde4360 (patch)
tree217696157c18ed2a291845191cc60e2b39bbf9d8 /tubes/qa
parentc55b2d0b32dd210c2a809ce2b5ebca12bfb5b1d8 (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 'tubes/qa')
-rw-r--r--tubes/qa/test_manager.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 81298d0c48e2..f914b3331033 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -129,7 +129,7 @@ void TestTeleTubes::testInitialize()
mpMainLoop = g_main_loop_new (NULL, FALSE);
g_timeout_add_seconds (10, timed_out, mpMainLoop);
- mpManager = TeleManager::get();
+ mpManager = new TeleManager();
}
void TestTeleTubes::testContactList()
@@ -279,12 +279,11 @@ void TestTeleTubes::testDestroyTeleTubes()
g_object_unref(mpAccepterContact);
mpAccepterContact = NULL;
}
- if (mpManager)
- mpManager->unref();
g_main_loop_unref( mpMainLoop );
if (mpConference1)
mpConference1->close();
delete mpConference1;
+ delete mpManager;
}
void TestTeleTubes::testFailAlways()