summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-11-15 13:15:15 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-11-15 13:15:15 (GMT)
commit0c6c79df29c58ff8790941ea40d40f84fae773c6 (patch)
tree0e7c99f5a8ad8ec286e89f1a69630d6de468ec30 /Swiften/Elements
parent004677623739ef53ae9f565d3ffd4d2b02a65d5a (diff)
downloadswift-contrib-0c6c79df29c58ff8790941ea40d40f84fae773c6.zip
swift-contrib-0c6c79df29c58ff8790941ea40d40f84fae773c6.tar.bz2
Clean MUC joins slightly.
In an attempt to catch errors, this doesn't Resolves: #691 but does add an assert that may help. It also fixes an error with created rooms not receiving updates presences. Release-Notes: Newly-created rooms will now receive your presence updates, consistent with existing rooms.
Diffstat (limited to 'Swiften/Elements')
-rw-r--r--Swiften/Elements/ErrorPayload.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/Swiften/Elements/ErrorPayload.h b/Swiften/Elements/ErrorPayload.h
index 8c74f0c..fab398e 100644
--- a/Swiften/Elements/ErrorPayload.h
+++ b/Swiften/Elements/ErrorPayload.h
@@ -41,6 +41,10 @@ namespace Swift {
ErrorPayload(Condition condition = UndefinedCondition, Type type = Cancel, const String& text = String()) : type_(type), condition_(condition), text_(text) { }
+ ErrorPayload(const ErrorPayload& other) : type_(other.getType()), condition_(other.getCondition()), text_(other.getText()) {
+
+ }
+
Type getType() const {
return type_;
}