Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-01 14:50:17 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-03 12:17:41 (GMT) |
| commit | 210accbcb135a9551cb56e5197a3a5acf8d15f49 (patch) | |
| tree | d330a827ff3f531ab01ab2bb3b8f047a477702c0 /Swiften/Elements | |
| parent | 9d9fb66aefef85a1c5ad432391014d15011747d1 (diff) | |
| download | swift-210accbcb135a9551cb56e5197a3a5acf8d15f49.zip swift-210accbcb135a9551cb56e5197a3a5acf8d15f49.tar.bz2 | |
Added JIDDiscoInfoResponder + Added "to" parameter to responder callback.
Diffstat (limited to 'Swiften/Elements')
| -rw-r--r-- | Swiften/Elements/IQ.cpp | 23 | ||||
| -rw-r--r-- | Swiften/Elements/IQ.h | 11 |
2 files changed, 32 insertions, 2 deletions
diff --git a/Swiften/Elements/IQ.cpp b/Swiften/Elements/IQ.cpp index 9df6ef4..abf32e9 100644 --- a/Swiften/Elements/IQ.cpp +++ b/Swiften/Elements/IQ.cpp @@ -21,8 +21,7 @@ boost::shared_ptr<IQ> IQ::createRequest( return iq; } -boost::shared_ptr<IQ> IQ::createResult( - const JID& to, const String& id, boost::shared_ptr<Payload> payload) { +boost::shared_ptr<IQ> IQ::createResult(const JID& to, const String& id, boost::shared_ptr<Payload> payload) { boost::shared_ptr<IQ> iq(new IQ(Result)); iq->setTo(to); iq->setID(id); @@ -32,6 +31,17 @@ boost::shared_ptr<IQ> IQ::createResult( return iq; } +boost::shared_ptr<IQ> IQ::createResult(const JID& to, const JID& from, const String& id, boost::shared_ptr<Payload> payload) { + boost::shared_ptr<IQ> iq(new IQ(Result)); + iq->setTo(to); + iq->setFrom(from); + iq->setID(id); + if (payload) { + iq->addPayload(payload); + } + return iq; +} + boost::shared_ptr<IQ> IQ::createError(const JID& to, const String& id, ErrorPayload::Condition condition, ErrorPayload::Type type) { boost::shared_ptr<IQ> iq(new IQ(IQ::Error)); iq->setTo(to); @@ -40,4 +50,13 @@ boost::shared_ptr<IQ> IQ::createError(const JID& to, const String& id, ErrorPayl return iq; } +boost::shared_ptr<IQ> IQ::createError(const JID& to, const JID& from, const String& id, ErrorPayload::Condition condition, ErrorPayload::Type type) { + boost::shared_ptr<IQ> iq(new IQ(IQ::Error)); + iq->setTo(to); + iq->setFrom(from); + iq->setID(id); + iq->addPayload(boost::shared_ptr<Swift::ErrorPayload>(new Swift::ErrorPayload(condition, type))); + return iq; +} + } diff --git a/Swiften/Elements/IQ.h b/Swiften/Elements/IQ.h index e15de24..007dda2 100644 --- a/Swiften/Elements/IQ.h +++ b/Swiften/Elements/IQ.h @@ -32,8 +32,19 @@ namespace Swift { const JID& to, const String& id, boost::shared_ptr<Payload> payload = boost::shared_ptr<Payload>()); + static boost::shared_ptr<IQ> createResult( + const JID& to, + const JID& from, + const String& id, + boost::shared_ptr<Payload> payload = boost::shared_ptr<Payload>()); + static boost::shared_ptr<IQ> createError( + const JID& to, + const String& id, + ErrorPayload::Condition condition = ErrorPayload::BadRequest, + ErrorPayload::Type type = ErrorPayload::Cancel); static boost::shared_ptr<IQ> createError( const JID& to, + const JID& from, const String& id, ErrorPayload::Condition condition = ErrorPayload::BadRequest, ErrorPayload::Type type = ErrorPayload::Cancel); |