Diffstat (limited to 'libkdepim/externalapphandler.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libkdepim/externalapphandler.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index bd83626..6100097 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -285,49 +285,48 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString | |||
285 | 285 | ||
286 | } | 286 | } |
287 | 287 | ||
288 | 288 | ||
289 | /*********************************************************************************/ | 289 | /*********************************************************************************/ |
290 | bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& data ) | 290 | bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& data ) |
291 | { | 291 | { |
292 | bool res = QCopTransferItem::appMessage( cmsg, data ); | 292 | bool res = QCopTransferItem::appMessage( cmsg, data ); |
293 | 293 | ||
294 | if (res == false) | 294 | if (res == false) |
295 | { | 295 | { |
296 | QDataStream stream( data, IO_ReadOnly ); | 296 | QDataStream stream( data, IO_ReadOnly ); |
297 | 297 | ||
298 | // qDebug("QCopListTransferItem- QCOP message received: %s ", cmsg.data() ); | 298 | // qDebug("QCopListTransferItem- QCOP message received: %s ", cmsg.data() ); |
299 | 299 | ||
300 | //we are in the source and get an answer from the target | 300 | //we are in the source and get an answer from the target |
301 | if ((_targetMessage + _targetMessageParameters) == cmsg.data()) | 301 | if ((_targetMessage + _targetMessageParameters) == cmsg.data()) |
302 | { | 302 | { |
303 | QStringList list1; | 303 | QStringList list1; |
304 | QStringList list2; | 304 | QStringList list2; |
305 | QStringList list3; | 305 | QStringList list3; |
306 | QString uid; | 306 | QString uid; |
307 | 307 | ||
308 | stream >> uid >> list1 >> list2 >> list3; | 308 | stream >> uid >> list1 >> list2 >> list3; |
309 | |||
310 | emit receivedMessageFromTarget(uid, list1, list2, list3); | 309 | emit receivedMessageFromTarget(uid, list1, list2, list3); |
311 | 310 | ||
312 | 311 | ||
313 | return true; | 312 | return true; |
314 | } | 313 | } |
315 | } | 314 | } |
316 | 315 | ||
317 | return false; | 316 | return false; |
318 | } | 317 | } |
319 | 318 | ||
320 | 319 | ||
321 | 320 | ||
322 | /********************************************************************************* | 321 | /********************************************************************************* |
323 | * | 322 | * |
324 | ********************************************************************************/ | 323 | ********************************************************************************/ |
325 | 324 | ||
326 | 325 | ||
327 | ExternalAppHandler *ExternalAppHandler::sInstance = 0; | 326 | ExternalAppHandler *ExternalAppHandler::sInstance = 0; |
328 | static KStaticDeleter<ExternalAppHandler> staticDeleter; | 327 | static KStaticDeleter<ExternalAppHandler> staticDeleter; |
329 | 328 | ||
330 | ExternalAppHandler::ExternalAppHandler() | 329 | ExternalAppHandler::ExternalAppHandler() |
331 | { | 330 | { |
332 | mDefaultItems.setAutoDelete(true); | 331 | mDefaultItems.setAutoDelete(true); |
333 | 332 | ||
@@ -949,49 +948,48 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete | |||
949 | } | 948 | } |
950 | else | 949 | else |
951 | { | 950 | { |
952 | // qDebug("pass parameter << %s", key.latin1()); | 951 | // qDebug("pass parameter << %s", key.latin1()); |
953 | (*e) << key; | 952 | (*e) << key; |
954 | } | 953 | } |
955 | } | 954 | } |
956 | 955 | ||
957 | if (useValMap == true) | 956 | if (useValMap == true) |
958 | (*e) << valmap; | 957 | (*e) << valmap; |
959 | 958 | ||
960 | #endif | 959 | #endif |
961 | 960 | ||
962 | } | 961 | } |
963 | 962 | ||
964 | 963 | ||
965 | 964 | ||
966 | /************************************************************************** | 965 | /************************************************************************** |
967 | * | 966 | * |
968 | **************************************************************************/ | 967 | **************************************************************************/ |
969 | 968 | ||
970 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) | 969 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) |
971 | { | 970 | { |
972 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 971 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
973 | |||
974 | if (!res) | 972 | if (!res) |
975 | res = mDisplayDetails->appMessage( cmsg, data ); | 973 | res = mDisplayDetails->appMessage( cmsg, data ); |
976 | 974 | ||
977 | // if (!res) | 975 | // if (!res) |
978 | // res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 976 | // res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
979 | } | 977 | } |
980 | 978 | ||
981 | 979 | ||
982 | 980 | ||
983 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) | 981 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) |
984 | { | 982 | { |
985 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 983 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
986 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); | 984 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); |
987 | } | 985 | } |
988 | 986 | ||
989 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) | 987 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) |
990 | { | 988 | { |
991 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 989 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
992 | return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3); | 990 | return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3); |
993 | } | 991 | } |
994 | 992 | ||
995 | bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email) | 993 | bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email) |
996 | { | 994 | { |
997 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); | 995 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); |