| -rw-r--r-- | libkdepim/externalapphandler.cpp | 36 | ||||
| -rw-r--r-- | libkdepim/externalapphandler.h | 10 |
2 files changed, 32 insertions, 14 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index b57506b..bd83626 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp @@ -36,3 +36,6 @@ $Id$ #ifndef DESKTOP_VERSION +#include <qpe/qpeapplication.h> #include <qtopia/qcopenvelope_qws.h> +#else +#include <qapplication.h> #endif @@ -56,3 +59,10 @@ QCopTransferItem::QCopTransferItem(int usedSourceParameters, const QString& sour //sourceMessage passes later three parameters: sourceChannel, uid, param1 + 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)"; } @@ -74,3 +84,3 @@ 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()); @@ -87,2 +97,3 @@ bool QCopTransferItem::sendMessageToTarget(const QString& uid, const QString& pa + qApp->processEvents(); @@ -110,4 +121,5 @@ bool QCopTransferItem::appMessage( const QCString& cmsg, const QByteArray& data { -/*US + // copied from old mail2 +/* static int ii = 0; @@ -123,3 +135,4 @@ bool QCopTransferItem::appMessage( const QCString& cmsg, const QByteArray& data */ - qDebug("QCopTransferItem- QCOP message received: %s ", cmsg.data() ); + +// qDebug("QCopTransferItem- QCOP message received: %s ", cmsg.data() ); @@ -128,2 +141,3 @@ bool QCopTransferItem::appMessage( const QCString& cmsg, const QByteArray& data { + QDataStream stream( data, IO_ReadOnly ); @@ -193,2 +207,4 @@ bool QCopMapTransferItem::sendMessageToSource(const QString& uid, const QMap<QSt + qApp->processEvents(); + return true; @@ -212,3 +228,3 @@ bool QCopMapTransferItem::appMessage( const QCString& cmsg, const QByteArray& da - qDebug("QCopMapTransferItem- QCOP message received: %s ", cmsg.data() ); +// qDebug("QCopMapTransferItem- QCOP message received: %s ", cmsg.data() ); @@ -260,2 +276,4 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString + qApp->processEvents(); + return true; @@ -279,3 +297,3 @@ bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& d - qDebug("QCopListTransferItem- QCOP message received: %s ", cmsg.data() ); +// qDebug("QCopListTransferItem- QCOP message received: %s ", cmsg.data() ); @@ -324,3 +342,3 @@ 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&))); } @@ -988,6 +1006,6 @@ 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 @@ -200,10 +200,10 @@ 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); |