summaryrefslogtreecommitdiff
path: root/tubes
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-03-26 23:54:58 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-07-17 16:40:02 +0200
commit44b6da67468ce59f14d228e8db5b117f5cd0066c (patch)
tree08378228b9238b914f91d4197018005e1136cd89 /tubes
parent7c5b100ce858189db83d7da152cf499cadb06afc (diff)
cleanout flushLoop
relict from testing era, not needed anymore
Diffstat (limited to 'tubes')
-rw-r--r--tubes/inc/tubes/manager.hxx3
-rw-r--r--tubes/qa/test_manager.cxx8
-rw-r--r--tubes/source/manager.cxx12
3 files changed, 0 insertions, 23 deletions
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 8ba3a020ce48..74d04246aea3 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -192,9 +192,6 @@ public:
/** Iterate our GMainLoop, blocking, until the callback is done. */
void iterateLoop( const TeleConference* pConference, ConferenceCallBackInvokedFunc pFunc );
- /** Iterate our GMainLoop, non-blocking, until nothing pending. */
- void flushLoop() const;
-
/// "LibreOfficeWhatEver"
static rtl::OString getFullClientName();
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index ae9b713da243..dcfbb4707f3a 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -60,7 +60,6 @@ public:
void testSendPacket();
void testReceivePacket();
void testSendFile();
- void testFlushLoops();
void testDestroyManager1();
void testDestroyManager2();
void testDestroyAccepterContact();
@@ -88,7 +87,6 @@ public:
CPPUNIT_TEST( testSendPacket );
CPPUNIT_TEST( testReceivePacket );
CPPUNIT_TEST( testSendFile );
- CPPUNIT_TEST( testFlushLoops );
CPPUNIT_TEST( testDestroyManager1 );
CPPUNIT_TEST( testDestroyManager2 );
CPPUNIT_TEST( testDestroyAccepterContact );
@@ -346,12 +344,6 @@ void TestTeleTubes::testSendFile()
maFileReceivedUri == "file:///tmp/LibreOffice-collab-test-config.ini");
}
-void TestTeleTubes::testFlushLoops()
-{
- mpManager1->flushLoop();
- mpManager2->flushLoop();
-}
-
void TestTeleTubes::testDestroyManager1()
{
delete mpManager1;
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 73895f9c6ee0..b9ecfd0a00c8 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -931,18 +931,6 @@ void TeleManager::iterateLoop( const TeleConference* pConference, ConferenceCall
}
-void TeleManager::flushLoop() const
-{
- if (pImpl->mpLoop)
- {
- GMainContext* pContext = g_main_loop_get_context( pImpl->mpLoop);
- while (g_main_context_iteration( pContext, FALSE))
- {
- }
- }
-}
-
-
GMainLoop* TeleManager::getMainLoop() const
{
return pImpl->mpLoop;