finish setting up QXmppRpcManager

2 files changed, 17 insertions, 9 deletions

diff --git a/src/QXmppRpcManager.cpp b/src/QXmppRpcManager.cpp
index 86cffbe1..ab327358 100644
--- a/src/QXmppRpcManager.cpp
+++ b/src/QXmppRpcManager.cpp
@@ -117,12 +117,11 @@ QXmppRemoteMethodResult QXmppRpcManager::callRemoteMethod( const QString &jid,
     if( arg10.isValid() ) args << arg10;
 
     QXmppRemoteMethod method( jid, interface, args, client() );
-#if 0
-    connect( d->stream, SIGNAL(rpcCallResponse(QXmppRpcResponseIq)),
-             &method, SLOT(gotResult(QXmppRpcResponseIq)));
-    connect( d->stream, SIGNAL(rpcCallError(QXmppRpcErrorIq)),
-             &method, SLOT(gotError(QXmppRpcErrorIq)));
-#endif
+    connect(this, SIGNAL(rpcCallResponse(QXmppRpcResponseIq)),
+            &method, SLOT(gotResult(QXmppRpcResponseIq)));
+    connect(this, SIGNAL(rpcCallError(QXmppRpcErrorIq)),
+            &method, SLOT(gotError(QXmppRpcErrorIq)));
+
     return method.call();
 }
 
@@ -139,21 +138,21 @@ bool QXmppRpcManager::handleStanza(const QDomElement &element)
     {
         QXmppRpcInvokeIq rpcIqPacket;
         rpcIqPacket.parse(element);
-        //emit rpcCallInvoke(rpcIqPacket);
+        emit rpcCallInvoke(rpcIqPacket);
         return true;
     }
     else if(QXmppRpcResponseIq::isRpcResponseIq(element))
     {
         QXmppRpcResponseIq rpcResponseIq;
         rpcResponseIq.parse(element);
-        //emit rpcCallResponse(rpcResponseIq);
+        emit rpcCallResponse(rpcResponseIq);
         return true;
     }
     else if(QXmppRpcErrorIq::isRpcErrorIq(element))
     {
         QXmppRpcErrorIq rpcErrorIq;
         rpcErrorIq.parse(element);
-        //emit rpcCallError(rpcErrorIq);
+        emit rpcCallError(rpcErrorIq);
         return true;
     }
     return false;
diff --git a/src/QXmppRpcManager.h b/src/QXmppRpcManager.h
index c6d0a167..d6317a26 100644
--- a/src/QXmppRpcManager.h
+++ b/src/QXmppRpcManager.h
@@ -31,7 +31,9 @@
 
 class QXmppInvokable;
 class QXmppRemoteMethodResult;
+class QXmppRpcErrorIq;
 class QXmppRpcInvokeIq;
+class QXmppRpcResponseIq;
 
 class QXmppRpcManager : public QXmppClientExtension
 {
@@ -59,6 +61,13 @@ public:
     bool handleStanza(const QDomElement &element);
     /// \endcond
 
+signals:
+    /// \cond
+    void rpcCallInvoke(const QXmppRpcInvokeIq &invoke);
+    void rpcCallResponse(const QXmppRpcResponseIq& result);
+    void rpcCallError(const QXmppRpcErrorIq &err);
+    /// \endcond
+
 private slots:
     void invokeInterfaceMethod(const QXmppRpcInvokeIq &iq);