summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-04-23 20:26:02 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-04-23 20:26:02 (GMT)
commitac8eb7c62838c7d85f451f2ee0f8456c14386137 (patch)
tree8b77da9045cf37c3de4bfd18ef004d30d26f38f0 /Swiften/Client/Client.cpp
parent4a8343171fd7717d61cb41b68055e32bc314503b (diff)
downloadswift-contrib-ac8eb7c62838c7d85f451f2ee0f8456c14386137.zip
swift-contrib-ac8eb7c62838c7d85f451f2ee0f8456c14386137.tar.bz2
Make sure setting disco info after reconnect does not immediately send presence.
Resolves: #976
Diffstat (limited to 'Swiften/Client/Client.cpp')
-rw-r--r--Swiften/Client/Client.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 48eddc2..4d3ee04 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -110,18 +110,19 @@ void Client::setSoftwareVersion(const std::string& name, const std::string& vers
softwareVersionResponder->setVersion(name, version, os);
}
void Client::handleConnected() {
#ifdef SWIFT_EXPERIMENTAL_FT
fileTransferManager = new FileTransferManagerImpl(getJID(), jingleSessionManager, getIQRouter(), getEntityCapsProvider(), presenceOracle, getNetworkFactories()->getConnectionFactory(), getNetworkFactories()->getConnectionServerFactory(), getNetworkFactories()->getTimerFactory(), getNetworkFactories()->getNATTraverser());
#else
fileTransferManager = new DummyFileTransferManager();
#endif
+ discoManager->handleConnected();
}
void Client::requestRoster() {
// FIXME: We should set this once when the session is finished, but there
// is currently no callback for this
if (getSession()) {
rosterController->setUseVersioning(getSession()->getRosterVersioningSupported());
}
rosterController->requestRoster();