Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-04-23 20:26:02 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-04-23 20:26:02 (GMT) |
| commit | ac8eb7c62838c7d85f451f2ee0f8456c14386137 (patch) | |
| tree | 8b77da9045cf37c3de4bfd18ef004d30d26f38f0 | |
| parent | 4a8343171fd7717d61cb41b68055e32bc314503b (diff) | |
| download | swift-contrib-ac8eb7c62838c7d85f451f2ee0f8456c14386137.zip swift-contrib-ac8eb7c62838c7d85f451f2ee0f8456c14386137.tar.bz2 | |
Make sure setting disco info after reconnect does not immediately send presence.
Resolves: #976
| -rw-r--r-- | Swiften/Client/Client.cpp | 1 | ||||
| -rw-r--r-- | Swiften/Disco/ClientDiscoManager.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Disco/ClientDiscoManager.h | 7 |
3 files changed, 12 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(); diff --git a/Swiften/Disco/ClientDiscoManager.cpp b/Swiften/Disco/ClientDiscoManager.cpp index 99c0175..cca0144 100644 --- a/Swiften/Disco/ClientDiscoManager.cpp +++ b/Swiften/Disco/ClientDiscoManager.cpp @@ -30,10 +30,14 @@ void ClientDiscoManager::setCapsNode(const std::string& node) { void ClientDiscoManager::setDiscoInfo(const DiscoInfo& discoInfo) { capsInfo = CapsInfo::ref(new CapsInfo(CapsInfoGenerator(capsNode).generateCapsInfo(discoInfo))); discoInfoResponder->clearDiscoInfo(); discoInfoResponder->setDiscoInfo(discoInfo); discoInfoResponder->setDiscoInfo(capsInfo->getNode() + "#" + capsInfo->getVersion(), discoInfo); presenceSender->setPayload(capsInfo); } +void ClientDiscoManager::handleConnected() { + presenceSender->reset(); +} + } diff --git a/Swiften/Disco/ClientDiscoManager.h b/Swiften/Disco/ClientDiscoManager.h index f8ba9ac..6f126eb 100644 --- a/Swiften/Disco/ClientDiscoManager.h +++ b/Swiften/Disco/ClientDiscoManager.h @@ -52,16 +52,23 @@ namespace Swift { * Returns the presence sender through which all outgoing presence * should be sent. * The manager will add the necessary caps information, and forward it to * the presence sender passed at construction time. */ PresenceSender* getPresenceSender() const { return presenceSender; } + /** + * Called when the client is connected. + * This resets the presence sender, such that it assumes initial presence + * hasn't been sent yet. + */ + void handleConnected(); + private: PayloadAddingPresenceSender* presenceSender; DiscoInfoResponder* discoInfoResponder; std::string capsNode; CapsInfo::ref capsInfo; }; } |