From a32c6d9c59792bd9b4d9e3f3bcedffed883ac738 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 9 Aug 2010 12:03:17 +0000
Subject: move Jabber-RPC handling alongside other extensions

---
 source/QXmppStream.cpp | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'source')

diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index 898681f7..8694449b 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -490,25 +490,7 @@ void QXmppStream::parser(const QByteArray& data)
                     if(type.isEmpty())
                         warning("QXmppStream: iq type can't be empty");
 
-                    if(QXmppRpcInvokeIq::isRpcInvokeIq(nodeRecv))
-                    {
-                        QXmppRpcInvokeIq rpcIqPacket;
-                        rpcIqPacket.parse(nodeRecv);
-                        emit rpcCallInvoke(rpcIqPacket);
-                    }
-                    else if(QXmppRpcResponseIq::isRpcResponseIq(nodeRecv))
-                    {
-                        QXmppRpcResponseIq rpcResponseIq;
-                        rpcResponseIq.parse(nodeRecv);
-                        emit rpcCallResponse(rpcResponseIq);
-                    }
-                    else if(QXmppRpcErrorIq::isRpcErrorIq(nodeRecv))
-                    {
-                        QXmppRpcErrorIq rpcErrorIq;
-                        rpcErrorIq.parse(nodeRecv);
-                        emit rpcCallError( rpcErrorIq );
-                    }
-                    else if(id == m_sessionId)
+                    if(id == m_sessionId)
                     {
                         QXmppSession session;
                         session.parse(nodeRecv);
@@ -552,6 +534,26 @@ void QXmppStream::parser(const QByteArray& data)
                     }
                     // extensions
 
+                    // XEP-0009: Jabber-RPC
+                    else if(QXmppRpcInvokeIq::isRpcInvokeIq(nodeRecv))
+                    {
+                        QXmppRpcInvokeIq rpcIqPacket;
+                        rpcIqPacket.parse(nodeRecv);
+                        emit rpcCallInvoke(rpcIqPacket);
+                    }
+                    else if(QXmppRpcResponseIq::isRpcResponseIq(nodeRecv))
+                    {
+                        QXmppRpcResponseIq rpcResponseIq;
+                        rpcResponseIq.parse(nodeRecv);
+                        emit rpcCallResponse(rpcResponseIq);
+                    }
+                    else if(QXmppRpcErrorIq::isRpcErrorIq(nodeRecv))
+                    {
+                        QXmppRpcErrorIq rpcErrorIq;
+                        rpcErrorIq.parse(nodeRecv);
+                        emit rpcCallError(rpcErrorIq);
+                    }
+
                     // XEP-0030: Service Discovery
                     else if(QXmppDiscoveryIq::isDiscoveryIq(nodeRecv))
                     {
-- 
cgit v1.2.3