2 files changed, 34 insertions, 15 deletions

diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.cpp b/x11/libqpe-x11/qt/qcopchannel_qws.cpp
index c315d66..e90f056 100644
--- a/x11/libqpe-x11/qt/qcopchannel_qws.cpp
+++ b/x11/libqpe-x11/qt/qcopchannel_qws.cpp
@@ -2,42 +2,59 @@
 #include "../../ipc/client/ocopclient.h"
 
 #include <qcopchannel_qws.h>
 
+QList<QCopChannel>* QCopChannel::m_list = 0;
+
 QCopChannel::QCopChannel( const QCString& channel, QObject* parent,
                           const char* name )
     : QObject( parent, name ),m_chan(channel) {
     init();
+    if (!m_list ) {
+        m_list = new QList<QCopChannel>;
+    }
+    m_list->append(this);
+}
+void QCopChannel::receive( const QCString& msg, const QByteArray& ar ) {
+    emit received( msg, ar );
 }
 QCopChannel::~QCopChannel() {
-    m_client->delChannel( m_chan );
-    delete m_client;
+    m_list->remove(this);
+    if (m_list->count() == 0 ) {
+        delete m_list;
+        m_list = 0;
+    }
+    OCOPClient::self()->delChannel( m_chan );
 }
 void QCopChannel::init() {
-    m_client = new OCOPClient(QString::null, this );
-    m_client->addChannel(m_chan );
-    connect(m_client, SIGNAL(called(const QCString&, const QCString&, const QByteArray& ) ),
+    OCOPClient::self()->addChannel( m_chan );
+    connect(OCOPClient::self(), SIGNAL(called(const QCString&, const QCString&, const QByteArray& ) ),
             this, SLOT(rev(const QCString&, const QCString&, const QByteArray&) ) );
 }
 QCString QCopChannel::channel()const {
     return m_chan;
 }
-bool QCopChannel::isRegistered( const QCString& chan) {
-    OCOPClient client;
-    return client.isRegistered( chan );
+bool QCopChannel::isRegistered( const QCString& chan) {;
+    return OCOPClient::self()->isRegistered( chan );
 }
 bool QCopChannel::send( const QCString& chan, const QCString& msg ) {
-    QByteArray ar(0);
-    return sendLocally(chan, msg, ar );
+    QByteArray ar;
+    return send(chan, msg, ar );
 }
 bool QCopChannel::send( const QCString& chan, const QCString& msg,
                      const QByteArray& ar ) {
-    return sendLocally( chan, msg, ar );
+    OCOPClient::self()->send( chan, msg, ar );
+    return true;
 }
-bool QCopChannel::sendLocally( const QCString& chan, const QCString& msg,
+bool QCopChannel::sendLocally( const QCString& chann, const QCString& msg,
                                const QByteArray& ar ) {
-    OCOPClient client;
-    client.send( chan, msg, ar );
+    if (!m_list )
+        return true;
+    QCopChannel* chan;
+    for ( chan = m_list->first(); chan; chan = m_list->next() ) {
+        if ( chan->channel() == chann )
+            chan->receive( msg, ar );
+    }
 
     return true;
 }
 void QCopChannel::rev( const QCString& chan, const QCString& msg, const QByteArray& ar ) {
diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.h b/x11/libqpe-x11/qt/qcopchannel_qws.h
index b0a6ce0..94b199e 100644
--- a/x11/libqpe-x11/qt/qcopchannel_qws.h
+++ b/x11/libqpe-x11/qt/qcopchannel_qws.h
@@ -2,8 +2,9 @@
 #define OPIE_QCOP_CHANNEL_QWS_H
 
 #include <qobject.h>
 #include <qcstring.h>
+#include <qlist.h>
 
 class OCOPClient;
 class QCopChannel : public QObject {
     Q_OBJECT
@@ -19,8 +20,9 @@ public:
     static bool send( const QCString& channel, const QCString& msg,
                       const QByteArray& );
     static bool sendLocally( const QCString& chan, const QCString& msg,
                              const QByteArray& data );
+    void receive( const QCString& msg, const QByteArray& ar );
 
 signals:
     void received( const QCString& msg, const QByteArray& );
 
@@ -28,9 +30,9 @@ private slots:
     void rev( const QCString& chan, const QCString&, const QByteArray& );
 
 private:
     void init();
-    OCOPClient* m_client;
+    static QList<QCopChannel> *m_list;
     /* the channel */
     QCString m_chan;
     class Private;
     Private *d;