diff options
author | Remko Tronçon <git@el-tramo.be> | 2010-11-28 12:08:54 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2010-11-28 12:18:04 (GMT) |
commit | f4e2f1deecd322e859bfb27bc5a9ab97726481c5 (patch) | |
tree | b50dc4515108f5a19cbbd4b615cff01c13c5866c /Swiften/MUC/MUC.cpp | |
parent | 5caf2316dad81d6c02ff3e886a65121011ccc9fe (diff) | |
download | swift-contrib-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.zip swift-contrib-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.tar.bz2 |
Change error from optional to shared_ptr in GenericRequest
Resolves: #692
Diffstat (limited to 'Swiften/MUC/MUC.cpp')
-rw-r--r-- | Swiften/MUC/MUC.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Swiften/MUC/MUC.cpp b/Swiften/MUC/MUC.cpp index 86c8ca9..4185fa8 100644 --- a/Swiften/MUC/MUC.cpp +++ b/Swiften/MUC/MUC.cpp @@ -175,10 +175,9 @@ void MUC::handleIncomingPresence(boost::shared_ptr<Presence> presence) { } -void MUC::handleCreationConfigResponse(boost::shared_ptr<MUCOwnerPayload> /*unused*/, const boost::optional<ErrorPayload>& error) { +void MUC::handleCreationConfigResponse(boost::shared_ptr<MUCOwnerPayload> /*unused*/, ErrorPayload::ref error) { if (error) { - boost::shared_ptr<ErrorPayload> errorCopy(new ErrorPayload(*error)); - onJoinFailed(errorCopy); + onJoinFailed(error); } else { /* onJoinComplete(getOwnNick()); isn't needed here, the presence will cause an emit elsewhere. */ presenceSender->addDirectedPresenceReceiver(ownMUCJID); |