aboutsummaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
Diffstat (limited to 'src/base')
-rw-r--r--src/base/QXmppStanza.h6
-rw-r--r--src/base/QXmppStanza_p.h4
2 files changed, 9 insertions, 1 deletions
diff --git a/src/base/QXmppStanza.h b/src/base/QXmppStanza.h
index 43ae4375..a25a138e 100644
--- a/src/base/QXmppStanza.h
+++ b/src/base/QXmppStanza.h
@@ -143,7 +143,8 @@ public:
ServiceUnavailable, ///< The service is currently not available.
SubscriptionRequired, ///< The requester needs to subscribe first.
UndefinedCondition, ///< An undefined condition was hit.
- UnexpectedRequest ///< The request was unexpected.
+ UnexpectedRequest, ///< The request was unexpected.
+ PolicyViolation ///< The entity has violated a local server policy. \since QXmpp 1.3
};
Error();
@@ -234,4 +235,7 @@ private:
static uint s_uniqeIdNo;
};
+Q_DECLARE_METATYPE(QXmppStanza::Error::Type);
+Q_DECLARE_METATYPE(QXmppStanza::Error::Condition);
+
#endif // QXMPPSTANZA_H
diff --git a/src/base/QXmppStanza_p.h b/src/base/QXmppStanza_p.h
index a5a7aa0c..03875639 100644
--- a/src/base/QXmppStanza_p.h
+++ b/src/base/QXmppStanza_p.h
@@ -65,6 +65,8 @@ static QString strFromCondition(const QXmppStanza::Error::Condition& condition)
return "not-authorized";
case QXmppStanza::Error::PaymentRequired:
return "payment-required";
+ case QXmppStanza::Error::PolicyViolation:
+ return "policy-violation";
case QXmppStanza::Error::RecipientUnavailable:
return "recipient-unavailable";
case QXmppStanza::Error::Redirect:
@@ -116,6 +118,8 @@ static QXmppStanza::Error::Condition conditionFromStr(const QString& string)
return QXmppStanza::Error::NotAuthorized;
else if (string == "payment-required")
return QXmppStanza::Error::PaymentRequired;
+ else if (string == "policy-violation")
+ return QXmppStanza::Error::PolicyViolation;
else if (string == "recipient-unavailable")
return QXmppStanza::Error::RecipientUnavailable;
else if (string == "redirect")