diff options
| -rw-r--r-- | qxmpp.pri | 2 | ||||
| -rw-r--r-- | src/base/QXmppGlobal.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppStanza.cpp | 4 | ||||
| -rw-r--r-- | src/base/QXmppStanza.h | 3 | ||||
| -rw-r--r-- | src/client/QXmppOutgoingClient.cpp | 2 | ||||
| -rw-r--r-- | tests/qxmpputils/tst_qxmpputils.cpp | 2 |
6 files changed, 11 insertions, 4 deletions
@@ -1,7 +1,7 @@ # Common definitions QT += network xml -QXMPP_VERSION = 0.8.2 +QXMPP_VERSION = 0.8.3 QXMPP_INCLUDEPATH = $$PWD/src/base $$PWD/src/client $$PWD/src/server # Determine library name diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h index 65424289..4a4ddddd 100644 --- a/src/base/QXmppGlobal.h +++ b/src/base/QXmppGlobal.h @@ -52,7 +52,7 @@ /// available. /// -#define QXMPP_VERSION 0x000802 +#define QXMPP_VERSION 0x000803 QXMPP_EXPORT QString QXmppVersion(); diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp index 1e512145..b840a06b 100644 --- a/src/base/QXmppStanza.cpp +++ b/src/base/QXmppStanza.cpp @@ -291,6 +291,8 @@ QString QXmppStanza::Error::getConditionStr() const return "undefined-condition"; case UnexpectedRequest: return "unexpected-request"; + case BadAuth: + return "bad-auth"; default: return ""; } @@ -358,6 +360,8 @@ void QXmppStanza::Error::setConditionFromStr(const QString& type) setCondition(UndefinedCondition); else if(type == "unexpected-request") setCondition(UnexpectedRequest); + else if(type == "bad-auth") + setCondition(BadAuth); else setCondition(static_cast<QXmppStanza::Error::Condition>(-1)); } diff --git a/src/base/QXmppStanza.h b/src/base/QXmppStanza.h index 4583bcd3..d5cd205d 100644 --- a/src/base/QXmppStanza.h +++ b/src/base/QXmppStanza.h @@ -125,7 +125,8 @@ public: ServiceUnavailable, SubscriptionRequired, UndefinedCondition, - UnexpectedRequest + UnexpectedRequest, + BadAuth }; Error(); diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp index 666b0365..cc14dbdf 100644 --- a/src/client/QXmppOutgoingClient.cpp +++ b/src/client/QXmppOutgoingClient.cpp @@ -540,6 +540,8 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) if (failure.condition() == "not-authorized") d->xmppStreamError = QXmppStanza::Error::NotAuthorized; + else if (failure.condition() == "bad-auth") + d->xmppStreamError = QXmppStanza::Error::BadAuth; else d->xmppStreamError = QXmppStanza::Error::UndefinedCondition; emit error(QXmppClient::XmppStreamError); diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp index 0e3bc1a6..7e494211 100644 --- a/tests/qxmpputils/tst_qxmpputils.cpp +++ b/tests/qxmpputils/tst_qxmpputils.cpp @@ -114,7 +114,7 @@ void tst_QXmppUtils::testMime() void tst_QXmppUtils::testLibVersion() { - QCOMPARE(QXmppVersion(), QString("0.8.2")); + QCOMPARE(QXmppVersion(), QString("0.8.3")); } void tst_QXmppUtils::testTimezoneOffset() |