summaryrefslogtreecommitdiffabout
path: root/libkdepim
Side-by-side diff
Diffstat (limited to 'libkdepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/externalapphandler.cpp52
-rw-r--r--libkdepim/externalapphandler.h10
2 files changed, 40 insertions, 22 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index b57506b..bd83626 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -35,5 +35,8 @@ $Id$
#ifndef DESKTOP_VERSION
+#include <qpe/qpeapplication.h>
#include <qtopia/qcopenvelope_qws.h>
+#else
+#include <qapplication.h>
#endif
@@ -55,5 +58,12 @@ QCopTransferItem::QCopTransferItem(int usedSourceParameters, const QString& sour
{
//sourceMessage passes later three parameters: sourceChannel, uid, param1
- _sourceMessageParameters = "(QString,QString,QString)";
+ if (_usedSourceParameters == 0)
+ _sourceMessageParameters = "(QString,QString)";
+ else if (_usedSourceParameters == 1)
+ _sourceMessageParameters = "(QString,QString,QString)";
+ else if (_usedSourceParameters == 2)
+ _sourceMessageParameters = "(QString,QString,QString,QString)";
+ else if (_usedSourceParameters == 3)
+ _sourceMessageParameters = "(QString,QString,QString,QString,QString)";
}
@@ -73,5 +83,5 @@ bool QCopTransferItem::sendMessageToTarget(const QString& uid, const QString& pa
qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", _targetChannel.latin1(), sourceMessage.latin1());
- qDebug("passing sourcechannel(%s), uid(%s), param1(%s), param3(%s), param3(%s) as parameter to QCopEnvelope", _sourceChannel.latin1(), uid.latin1(), param1.latin1(), param2.latin1(), param3.latin1());
+ qDebug("passing sourcechannel(%s), uid(%s), param1(%s), param2(%s), param3(%s) as parameter to QCopEnvelope", _sourceChannel.latin1(), uid.latin1(), param1.latin1(), param2.latin1(), param3.latin1());
QCopEnvelope e(_targetChannel.latin1(), sourceMessage.latin1());
@@ -86,4 +96,5 @@ bool QCopTransferItem::sendMessageToTarget(const QString& uid, const QString& pa
e << param1 << param2 << param3;
+ qApp->processEvents();
return true;
@@ -109,22 +120,25 @@ void QCopTransferItem::setSourceChannel(const QString& sourceChannel)
bool QCopTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
{
-/*US
+
// copied from old mail2
+/*
static int ii = 0;
- // block second call
- if ( ii < 2 ) {
- ++ii;
- if ( ii > 1 ) {
- qDebug("qcop call blocked ");
- return true;
+ // block second call
+ if ( ii < 2 ) {
+ ++ii;
+ if ( ii > 1 ) {
+ qDebug("qcop call blocked ");
+ return true;
+ }
}
- }
*/
- qDebug("QCopTransferItem- QCOP message received: %s ", cmsg.data() );
+
+// qDebug("QCopTransferItem- QCOP message received: %s ", cmsg.data() );
//we are in the target and get a request from the source
if ( (_sourceMessage + _sourceMessageParameters) == cmsg.data())
{
+
QDataStream stream( data, IO_ReadOnly );
@@ -192,4 +206,6 @@ bool QCopMapTransferItem::sendMessageToSource(const QString& uid, const QMap<QSt
e << uid << nameEmailMap;
+ qApp->processEvents();
+
return true;
@@ -211,5 +227,5 @@ bool QCopMapTransferItem::appMessage( const QCString& cmsg, const QByteArray& da
QDataStream stream( data, IO_ReadOnly );
- qDebug("QCopMapTransferItem- QCOP message received: %s ", cmsg.data() );
+// qDebug("QCopMapTransferItem- QCOP message received: %s ", cmsg.data() );
//we are in the source and get an answer from the target
@@ -259,4 +275,6 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString
e << uid << list1 << list2 << list3;
+ qApp->processEvents();
+
return true;
@@ -278,5 +296,5 @@ bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& d
QDataStream stream( data, IO_ReadOnly );
- qDebug("QCopListTransferItem- QCOP message received: %s ", cmsg.data() );
+// qDebug("QCopListTransferItem- QCOP message received: %s ", cmsg.data() );
//we are in the source and get an answer from the target
@@ -323,5 +341,5 @@ ExternalAppHandler::ExternalAppHandler()
mDisplayDetails = new QCopListTransferItem(3, "requestDisplayDetailsFromKAPI", "QPE/Application/kapi", "");
- connect(mDisplayDetails, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&, const QString&)), this, SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
+ connect(mDisplayDetails, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&, const QString&, const QString&)), this, SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
}
@@ -987,8 +1005,8 @@ bool ExternalAppHandler::returnFindByEmailFromKAPI(const QString& sourceChannel,
}
-bool ExternalAppHandler::requestDetailsFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid)
+bool ExternalAppHandler::requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid)
{
- mDisplayDetails->setSourceChannel(sourceChannel);
- return mDisplayDetails->sendMessageToTarget(sessionuid, name, email, uid);
+ mDisplayDetails->setSourceChannel("");
+ return mDisplayDetails->sendMessageToTarget("", name, email, uid);
}
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index a74080f..1b04b2b 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -199,12 +199,12 @@ class ExternalAppHandler : public QObject
//Call this method on the source when you want to select names from the addressbook by using QCop
- bool requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& uid);
+ bool requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid);
//Call this method on the target when you want to return the name/email map to the source (client).
- bool returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& uid, const QStringList& name, const QStringList& email, const QStringList& uid);
+ bool returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid);
- bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& uid, const QString& email);
- bool returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& uid, const QStringList& name, const QStringList& email, const QStringList& uid);
+ bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email);
+ bool returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid);
- bool requestDetailsFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
+ bool requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid);