summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-07-13 19:34:30 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-07-17 16:40:24 +0200
commiteafd7161ed544cebb450a334d8c13d15170e987b (patch)
treefd22d2ddd86bd08e2a109dc2b14b333b22bd4a6f
parenttubes: create TeleManager when starting Collaboration dialog (diff)
downloadcore-eafd7161ed544cebb450a334d8c13d15170e987b.tar.gz
core-eafd7161ed544cebb450a334d8c13d15170e987b.zip
tubes: remove unused TeleManager::mbAcceptIncoming
Change-Id: Idb4f8e4e47be88efa9e199588936cf426b3e1ce4
-rw-r--r--sc/source/ui/collab/sendfunc.cxx2
-rw-r--r--tubes/inc/tubes/manager.hxx6
-rw-r--r--tubes/qa/test_manager.cxx4
-rw-r--r--tubes/source/manager.cxx7
4 files changed, 8 insertions, 11 deletions
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 4e91b7ee6137..29898150dad8 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -301,7 +301,7 @@ bool ScDocFuncSend::InitTeleManager( bool bIsMaster )
fprintf( stderr, "TeleManager is already connected.\n" );
return true;
}
- TeleManager *pManager = TeleManager::get( !bIsMaster );
+ TeleManager *pManager = TeleManager::get();
pManager->sigPacketReceived.connect( boost::bind(
&ScDocFuncRecv::packetReceived, mpDirect, _1, _2 ));
pManager->sigFileReceived.connect( boost::bind(
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index f926ec122ef1..6eb7915e31bd 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -79,11 +79,10 @@ public:
Whether to create and iterate an own GMainLoop. For testing
purposes when no GMainLoop is available.
*/
- TeleManager( bool bAcceptIncoming = true, bool bCreateOwnGMainLoop = false );
+ TeleManager( bool bCreateOwnGMainLoop = false );
~TeleManager();
- static TeleManager *get() { return pSingleton; }
- static TeleManager *get( bool bAcceptIncoming );
+ static TeleManager *get();
void unref();
/** Connect to DBus and create AccountManager. */
@@ -239,7 +238,6 @@ private:
TeleConferenceVector maConferences;
- bool mbAcceptIncoming;
bool mbChannelReadyHandlerInvoked : 1;
static TeleManagerImpl* pImpl;
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 1254973a7ef9..6f9a7ba0f768 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -213,12 +213,12 @@ void TestTeleTubes::testContactList()
void TestTeleTubes::testSetupManager1()
{
- mpManager1 = new TeleManager( true, true);
+ mpManager1 = new TeleManager(true);
}
void TestTeleTubes::testSetupManager2()
{
- mpManager2 = new TeleManager( true );
+ mpManager2 = new TeleManager();
}
void TestTeleTubes::testPrepareAccountManager1()
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 047e54abf98c..14df6e1208f1 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -325,9 +325,8 @@ static void TeleManager_AccountManagerReadyHandler(
}
-TeleManager::TeleManager( bool bAcceptIncoming, bool bCreateOwnGMainLoop )
+TeleManager::TeleManager( bool bCreateOwnGMainLoop )
:
- mbAcceptIncoming( bAcceptIncoming ),
mbChannelReadyHandlerInvoked( false)
{
// The glib object types need to be initialized, else we aren't going
@@ -359,11 +358,11 @@ TeleManager::~TeleManager()
}
TeleManager *
-TeleManager::get( bool bAcceptIncoming )
+TeleManager::get()
{
MutexGuard aGuard( GetAnotherMutex());
if (!pSingleton)
- pSingleton = new TeleManager(bAcceptIncoming);
+ pSingleton = new TeleManager();
nAnotherRefCount++;
return pSingleton;