From 3c7f718e0595ad041b52a6d27116b70bef62fb60 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 1 Feb 2010 10:57:30 +0000
Subject: report XMPP stream errors (issue #40)

---
 source/QXmppStream.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'source/QXmppStream.cpp')

diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index 0e18b404..7d252a35 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -341,6 +341,14 @@ void QXmppStream::parser(const QByteArray& data)
                     m_sessionAvaliable = true;
                 }
             }
+            else if(ns == ns_stream && nodeRecv.tagName() == "error")
+            {
+                if (!nodeRecv.firstChildElement("conflict").isNull())
+                    m_xmppStreamError = QXmppClient::ConflictStreamError;
+                else
+                    m_xmppStreamError = QXmppClient::UnknownStreamError;
+                emit error(QXmppClient::XmppStreamError);
+            }
             else if(ns == ns_tls)
             {
                 if(nodeRecv.tagName() == "proceed")
@@ -997,6 +1005,11 @@ QAbstractSocket::SocketError QXmppStream::getSocketError()
     return m_socketError;
 }
 
+QXmppClient::StreamError QXmppStream::getXmppStreamError()
+{
+    return m_xmppStreamError;
+}
+
 QXmppVCardManager& QXmppStream::getVCardManager()
 {
     return m_vCardManager;
-- 
cgit v1.2.3