Merge branch 'master' of github.com:qxmpp-project/qxmpp

3 files changed, 7 insertions, 2 deletions

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();