-rw-r--r-- | x11/ipc/client/ocopclient.cpp | 8 | ||||
-rw-r--r-- | x11/ipc/server/ocopserver.cpp | 38 | ||||
-rw-r--r-- | x11/libqpe-x11/qpe/qpeapplication.cpp | 4 | ||||
-rw-r--r-- | x11/libqpe-x11/qt/qcopchannel_qws.cpp | 11 |
4 files changed, 34 insertions, 27 deletions
diff --git a/x11/ipc/client/ocopclient.cpp b/x11/ipc/client/ocopclient.cpp index 91827e7..f59fa41 100644 --- a/x11/ipc/client/ocopclient.cpp +++ b/x11/ipc/client/ocopclient.cpp | |||
@@ -101,3 +101,3 @@ OCOPPacket OCOPClient::packet() const{ | |||
101 | if ( head.magic == 47 ) { | 101 | if ( head.magic == 47 ) { |
102 | qWarning("Client:Magic Match"); | 102 | // qWarning("Client:Magic Match"); |
103 | chan = QCString( head.chlen+1); | 103 | chan = QCString( head.chlen+1); |
@@ -108,3 +108,3 @@ OCOPPacket OCOPClient::packet() const{ | |||
108 | read(m_socket, ar.data(), head.datalen ); | 108 | read(m_socket, ar.data(), head.datalen ); |
109 | qWarning("Client:%d %s",head.chlen,chan.data() ); | 109 | //qWarning("Client:%d %s",head.chlen,chan.data() ); |
110 | } | 110 | } |
@@ -119,3 +119,3 @@ OCOPPacket OCOPClient::packet() const{ | |||
119 | bool OCOPClient::isRegistered( const QCString& chan ) const{ | 119 | bool OCOPClient::isRegistered( const QCString& chan ) const{ |
120 | qWarning("OCopClient::isRegistered %s", chan.data() ); | 120 | // qWarning("OCopClient::isRegistered %s", chan.data() ); |
121 | /* should I disconnect the socket notfier? */ | 121 | /* should I disconnect the socket notfier? */ |
@@ -139,3 +139,3 @@ bool OCOPClient::isRegistered( const QCString& chan ) const{ | |||
139 | void OCOPClient::send( const QCString& chan, const QCString& fu, const QByteArray& arr ) { | 139 | void OCOPClient::send( const QCString& chan, const QCString& fu, const QByteArray& arr ) { |
140 | qWarning("ClientSending %s %s", chan.data(), fu.data() ); | 140 | // qWarning("ClientSending %s %s", chan.data(), fu.data() ); |
141 | OCOPPacket pack(OCOPPacket::Call, chan, fu, arr ); | 141 | OCOPPacket pack(OCOPPacket::Call, chan, fu, arr ); |
diff --git a/x11/ipc/server/ocopserver.cpp b/x11/ipc/server/ocopserver.cpp index ee5ea18..992cb8c 100644 --- a/x11/ipc/server/ocopserver.cpp +++ b/x11/ipc/server/ocopserver.cpp | |||
@@ -33,3 +33,3 @@ void OCopServer::init() { | |||
33 | */ | 33 | */ |
34 | qWarning("SIGPIPE to be ignored"); | 34 | // qWarning("SIGPIPE to be ignored"); |
35 | signal(SIGPIPE, SIG_IGN ); | 35 | signal(SIGPIPE, SIG_IGN ); |
@@ -123,3 +123,3 @@ void OCopServer::newOnServer() { | |||
123 | */ | 123 | */ |
124 | qWarning("Heureka new connection %d", fd ); | 124 | // qWarning("Heureka new connection %d", fd ); |
125 | 125 | ||
@@ -196,4 +196,4 @@ void OCopServer::newOnClient( int fd ) { | |||
196 | }else{ | 196 | }else{ |
197 | qWarning("magic does not match"); | 197 | // qWarning("magic does not match"); |
198 | qWarning("magic %d", head.magic ); | 198 | // qWarning("magic %d", head.magic ); |
199 | } | 199 | } |
@@ -211,3 +211,3 @@ void OCopServer::registerClient( int fd ) { | |||
211 | m_clients.insert( client.fd, client ); | 211 | m_clients.insert( client.fd, client ); |
212 | qWarning("clients are up to %d", m_clients.count() ); | 212 | // qWarning("clients are up to %d", m_clients.count() ); |
213 | }; | 213 | }; |
@@ -231,3 +231,3 @@ void OCopServer::deregisterClient(int fd ) { | |||
231 | */ | 231 | */ |
232 | qWarning("Channel %s %d", it2.key().data(), it2.data().count() ); | 232 | // qWarning("Channel %s %d", it2.key().data(), it2.data().count() ); |
233 | if ( it2.data().contains( fd ) ) { | 233 | if ( it2.data().contains( fd ) ) { |
@@ -240,3 +240,3 @@ void OCopServer::deregisterClient(int fd ) { | |||
240 | if ( array.count() == 1 || array.count() == 0) { | 240 | if ( array.count() == 1 || array.count() == 0) { |
241 | qWarning("Invalidate!"); | 241 | // qWarning("Invalidate!"); |
242 | /* is the list now invalidatet? */ | 242 | /* is the list now invalidatet? */ |
@@ -252,3 +252,3 @@ void OCopServer::deregisterClient(int fd ) { | |||
252 | }else{ | 252 | }else{ |
253 | qWarning("removing count %d %d",fd, array.count() ); | 253 | // qWarning("removing count %d %d",fd, array.count() ); |
254 | QValueList<int>::Iterator it3 = array.find( fd ); | 254 | QValueList<int>::Iterator it3 = array.find( fd ); |
@@ -265,4 +265,4 @@ void OCopServer::deregisterClient(int fd ) { | |||
265 | } | 265 | } |
266 | qWarning("clients are now at %d", m_clients.count() ); | 266 | // qWarning("clients are now at %d", m_clients.count() ); |
267 | }; | 267 | } |
268 | /** | 268 | /** |
@@ -272,3 +272,3 @@ void OCopServer::deregisterClient(int fd ) { | |||
272 | void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { | 272 | void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { |
273 | qWarning("packet.type() == %d", packet.type() ); | 273 | // qWarning("packet.type() == %d", packet.type() ); |
274 | switch( packet.type() ) { | 274 | switch( packet.type() ) { |
@@ -302,3 +302,3 @@ void OCopServer::dispatch( const OCOPPacket& packet, int sourceFD ) { | |||
302 | case OCOPPacket::IsRegistered: | 302 | case OCOPPacket::IsRegistered: |
303 | qWarning("Server:IsRegistered %s", packet.channel().data() ); | 303 | // qWarning("Server:IsRegistered %s", packet.channel().data() ); |
304 | isRegistered( packet.channel(), sourceFD ); | 304 | isRegistered( packet.channel(), sourceFD ); |
@@ -335,3 +335,3 @@ void OCopServer::addChannel( const QCString& channel, | |||
335 | list.append( fd ); | 335 | list.append( fd ); |
336 | qWarning("count is now in addChannel %d %s", list.count(), channel.data() ); | 336 | qWarning("Server:count is now in addChannel %d %s", list.count(), channel.data() ); |
337 | it = m_channels.replace( channel, list ); | 337 | it = m_channels.replace( channel, list ); |
@@ -345,3 +345,3 @@ void OCopServer::delChannel( const QCString& channel, | |||
345 | int fd ) { | 345 | int fd ) { |
346 | qWarning("remove %s, %d", channel.data(), fd ); | 346 | // qWarning("remove %s, %d", channel.data(), fd ); |
347 | if (!m_channels.contains( channel ) ) | 347 | if (!m_channels.contains( channel ) ) |
@@ -363,3 +363,3 @@ void OCopServer::delChannel( const QCString& channel, | |||
363 | } | 363 | } |
364 | qWarning(" channel count is now %d", ints.count() ); | 364 | // qWarning(" channel count is now %d", ints.count() ); |
365 | } | 365 | } |
@@ -367,3 +367,3 @@ void OCopServer::delChannel( const QCString& channel, | |||
367 | void OCopServer::isRegistered( const QCString& channel, int fd) { | 367 | void OCopServer::isRegistered( const QCString& channel, int fd) { |
368 | qWarning("Server:isRegistered %s", channel.data() ); | 368 | // qWarning("Server:isRegistered %s", channel.data() ); |
369 | OCOPHead head; | 369 | OCOPHead head; |
@@ -381,6 +381,6 @@ void OCopServer::isRegistered( const QCString& channel, int fd) { | |||
381 | func[0] = 1; | 381 | func[0] = 1; |
382 | qWarning("Server:Channel is Registered %d", head.chlen); | 382 | //qWarning("Server:Channel is Registered %d", head.chlen); |
383 | }else{ | 383 | }else{ |
384 | func[0] = 0; | 384 | func[0] = 0; |
385 | qWarning("Server:Channel is NotRegistered"); | 385 | //qWarning("Server:Channel is NotRegistered"); |
386 | } | 386 | } |
@@ -405,3 +405,3 @@ void OCopServer::call( const OCOPPacket& p, int ) { | |||
405 | for (it = cli.begin(); it != cli.end(); ++it ) { | 405 | for (it = cli.begin(); it != cli.end(); ++it ) { |
406 | qWarning("Server:calling %d %s %s", (*it), p.channel().data(), p.header().data() ); | 406 | // qWarning("Server:calling %d %s %s", (*it), p.channel().data(), p.header().data() ); |
407 | write( (*it), &head, sizeof(head ) ); | 407 | write( (*it), &head, sizeof(head ) ); |
diff --git a/x11/libqpe-x11/qpe/qpeapplication.cpp b/x11/libqpe-x11/qpe/qpeapplication.cpp index 49115d8..c4f8f38 100644 --- a/x11/libqpe-x11/qpe/qpeapplication.cpp +++ b/x11/libqpe-x11/qpe/qpeapplication.cpp | |||
@@ -501,4 +501,4 @@ void QPEApplication::internalSetStyle( const QString& ) { | |||
501 | } | 501 | } |
502 | void QPEApplication::systemMessage( const QCString&, const QByteArray& ) { | 502 | void QPEApplication::systemMessage( const QCString& chan, const QByteArray& ) { |
503 | 503 | qWarning("QPEApplication::systemMessage( %s )", chan.data() ); | |
504 | } | 504 | } |
diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.cpp b/x11/libqpe-x11/qt/qcopchannel_qws.cpp index 1cea80c..706756e 100644 --- a/x11/libqpe-x11/qt/qcopchannel_qws.cpp +++ b/x11/libqpe-x11/qt/qcopchannel_qws.cpp | |||
@@ -19,6 +19,9 @@ QCopChannel::QCopChannel( const QCString& channel, QObject* parent, | |||
19 | if (!m_refCount.contains( m_chan ) || !m_refCount[m_chan] ) { | 19 | if (!m_refCount.contains( m_chan ) || !m_refCount[m_chan] ) { |
20 | qWarning("adding channel %s", m_chan.data() ); | ||
20 | m_refCount[m_chan] = 1; | 21 | m_refCount[m_chan] = 1; |
21 | OCOPClient::self()->addChannel( m_chan ); | 22 | OCOPClient::self()->addChannel( m_chan ); |
22 | }else | 23 | }else{ |
24 | qWarning("reffing up for %s %d", m_chan.data(), m_refCount[m_chan] ); | ||
23 | m_refCount[m_chan]++; | 25 | m_refCount[m_chan]++; |
26 | } | ||
24 | 27 | ||
@@ -47,3 +50,7 @@ QCString QCopChannel::channel()const { | |||
47 | } | 50 | } |
48 | bool QCopChannel::isRegistered( const QCString& chan) {; | 51 | bool QCopChannel::isRegistered( const QCString& chan) { |
52 | if (m_refCount.contains(chan) ) { | ||
53 | qDebug("Client:locally contains"); | ||
54 | return true; | ||
55 | } | ||
49 | return OCOPClient::self()->isRegistered( chan ); | 56 | return OCOPClient::self()->isRegistered( chan ); |