summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-11-28 12:08:54 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-11-28 12:18:04 (GMT)
commitf4e2f1deecd322e859bfb27bc5a9ab97726481c5 (patch)
treeb50dc4515108f5a19cbbd4b615cff01c13c5866c /Swiften/Disco
parent5caf2316dad81d6c02ff3e886a65121011ccc9fe (diff)
downloadswift-contrib-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.zip
swift-contrib-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.tar.bz2
Change error from optional to shared_ptr in GenericRequest
Resolves: #692
Diffstat (limited to 'Swiften/Disco')
-rw-r--r--Swiften/Disco/CapsManager.cpp2
-rw-r--r--Swiften/Disco/CapsManager.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Disco/CapsManager.cpp b/Swiften/Disco/CapsManager.cpp
index 43c2805..1c785e5 100644
--- a/Swiften/Disco/CapsManager.cpp
+++ b/Swiften/Disco/CapsManager.cpp
@@ -48,7 +48,7 @@ void CapsManager::handleStanzaChannelAvailableChanged(bool available) {
}
}
-void CapsManager::handleDiscoInfoReceived(const JID& from, const String& hash, DiscoInfo::ref discoInfo, const boost::optional<ErrorPayload>& error) {
+void CapsManager::handleDiscoInfoReceived(const JID& from, const String& hash, DiscoInfo::ref discoInfo, ErrorPayload::ref error) {
requestedDiscoInfos.erase(hash);
if (error || CapsInfoGenerator("").generateCapsInfo(*discoInfo.get()).getVersion() != hash) {
if (warnOnInvalidHash && !error) {
diff --git a/Swiften/Disco/CapsManager.h b/Swiften/Disco/CapsManager.h
index cbe3a44..842f2be 100644
--- a/Swiften/Disco/CapsManager.h
+++ b/Swiften/Disco/CapsManager.h
@@ -36,7 +36,7 @@ namespace Swift {
private:
void handlePresenceReceived(boost::shared_ptr<Presence>);
void handleStanzaChannelAvailableChanged(bool);
- void handleDiscoInfoReceived(const JID&, const String& hash, DiscoInfo::ref, const boost::optional<ErrorPayload>&);
+ void handleDiscoInfoReceived(const JID&, const String& hash, DiscoInfo::ref, ErrorPayload::ref);
void requestDiscoInfo(const JID& jid, const String& node, const String& hash);
private: