summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/externalapphandler.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 1093abf..35638b1 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -298,13 +298,13 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS
298 298
299 //first check if one of the mailers need the emails right in the message. 299 //first check if one of the mailers need the emails right in the message.
300 message2 = translateMessage(message2, emails, urls); 300 message2 = translateMessage(message2, emails, urls);
301 301
302 302
303 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message2.latin1()); 303 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message2.latin1());
304 qDebug("passing emailadresses:(%s), attachmenturls:(%s) as parameters in the form %s to QCopEnvelope", emails.latin1() , urls.latin1(), parameters2.latin1()); 304 qDebug("passing emailadresses(%s), attachmenturls(%s) as parameters in the form %s to QCopEnvelope", emails.latin1() , urls.latin1(), parameters2.latin1());
305 305
306 306
307 QCopEnvelope e(channel.latin1(), message2.latin1()); 307 QCopEnvelope e(channel.latin1(), message2.latin1());
308 //US we need no names in the To field. The emailadresses are enough 308 //US we need no names in the To field. The emailadresses are enough
309 309
310 passParameters(&e, parameters2, emails, urls); 310 passParameters(&e, parameters2, emails, urls);
@@ -355,13 +355,13 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e
355 355
356 //first check if one of the mailers need the emails right in the message. 356 //first check if one of the mailers need the emails right in the message.
357 message = translateMessage(message, name, emailadress); 357 message = translateMessage(message, name, emailadress);
358 358
359 359
360 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1()); 360 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
361 qDebug("passing name:(%s), emailadresses:(%s) as parameters in the form %s to QCopEnvelope", name.latin1(), emailadress.latin1(), parameters.latin1()); 361 qDebug("passing name(%s), emailadresses(%s) as parameters in the form %s to QCopEnvelope", name.latin1(), emailadress.latin1(), parameters.latin1());
362 362
363 QCopEnvelope e(channel.latin1(), message.latin1()); 363 QCopEnvelope e(channel.latin1(), message.latin1());
364 //US we need no names in the To field. The emailadresses are enough 364 //US we need no names in the To field. The emailadresses are enough
365 365
366 passParameters(&e, parameters, name, emailadress); 366 passParameters(&e, parameters, name, emailadress);
367 367
@@ -431,13 +431,13 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber )
431 431
432 //first check if one of the mailers need the emails right in the message. 432 //first check if one of the mailers need the emails right in the message.
433 message = translateMessage(message, phonenumber, ""); 433 message = translateMessage(message, phonenumber, "");
434 434
435 435
436 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1()); 436 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
437 qDebug("passing phonenumber:(%s) as parameter in the form %s to QCopEnvelope", phonenumber.latin1(), parameters.latin1()); 437 qDebug("passing phonenumber(%s) as parameter in the form %s to QCopEnvelope", phonenumber.latin1(), parameters.latin1());
438 438
439 QCopEnvelope e(channel.latin1(), message.latin1()); 439 QCopEnvelope e(channel.latin1(), message.latin1());
440 //US we need no names in the To field. The emailadresses are enough 440 //US we need no names in the To field. The emailadresses are enough
441 441
442 passParameters(&e, parameters, phonenumber, ""); 442 passParameters(&e, parameters, phonenumber, "");
443 443
@@ -486,13 +486,13 @@ bool ExternalAppHandler::callBySMS( const QString& phonenumber )
486 486
487 //first check if one of the mailers need the emails right in the message. 487 //first check if one of the mailers need the emails right in the message.
488 message = translateMessage(message, phonenumber, ""); 488 message = translateMessage(message, phonenumber, "");
489 489
490 490
491 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1()); 491 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
492 qDebug("passing phonenumber:(%s) as parameter in the form %s to QCopEnvelope", phonenumber.latin1(), parameters.latin1()); 492 qDebug("passing phonenumber(%s) as parameter in the form %s to QCopEnvelope", phonenumber.latin1(), parameters.latin1());
493 493
494 QCopEnvelope e(channel.latin1(), message.latin1()); 494 QCopEnvelope e(channel.latin1(), message.latin1());
495 //US we need no names in the To field. The emailadresses are enough 495 //US we need no names in the To field. The emailadresses are enough
496 496
497 passParameters(&e, parameters, phonenumber, ""); 497 passParameters(&e, parameters, phonenumber, "");
498 498
@@ -541,13 +541,13 @@ bool ExternalAppHandler::callByPager( const QString& pagernumber )
541 541
542 //first check if one of the mailers need the emails right in the message. 542 //first check if one of the mailers need the emails right in the message.
543 message = translateMessage(message, pagernumber, ""); 543 message = translateMessage(message, pagernumber, "");
544 544
545 545
546 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1()); 546 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
547 qDebug("passing pagernumber:(%s) as parameter in the form %s to QCopEnvelope", pagernumber.latin1(), parameters.latin1()); 547 qDebug("passing pagernumber(%s) as parameter in the form %s to QCopEnvelope", pagernumber.latin1(), parameters.latin1());
548 548
549 QCopEnvelope e(channel.latin1(), message.latin1()); 549 QCopEnvelope e(channel.latin1(), message.latin1());
550 //US we need no names in the To field. The emailadresses are enough 550 //US we need no names in the To field. The emailadresses are enough
551 551
552 passParameters(&e, parameters, pagernumber, ""); 552 passParameters(&e, parameters, pagernumber, "");
553 553
@@ -596,13 +596,13 @@ bool ExternalAppHandler::callByFax( const QString& faxnumber )
596 596
597 //first check if one of the mailers need the emails right in the message. 597 //first check if one of the mailers need the emails right in the message.
598 message = translateMessage(message, faxnumber, ""); 598 message = translateMessage(message, faxnumber, "");
599 599
600 600
601 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1()); 601 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
602 qDebug("passing faxnumber:(%s) as parameter in the form %s to QCopEnvelope", faxnumber.latin1(), parameters.latin1()); 602 qDebug("passing faxnumber(%s) as parameter in the form %s to QCopEnvelope", faxnumber.latin1(), parameters.latin1());
603 603
604 QCopEnvelope e(channel.latin1(), message.latin1()); 604 QCopEnvelope e(channel.latin1(), message.latin1());
605 //US we need no names in the To field. The emailadresses are enough 605 //US we need no names in the To field. The emailadresses are enough
606 606
607 passParameters(&e, parameters, faxnumber, ""); 607 passParameters(&e, parameters, faxnumber, "");
608 608
@@ -662,13 +662,14 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete
662 662
663 valmap.insert(key, value); 663 valmap.insert(key, value);
664 useValMap = true; 664 useValMap = true;
665 } 665 }
666 else 666 else
667 { 667 {
668 (*e) << key.latin1(); 668 // qDebug("pass parameter << %s", key.latin1());
669 (*e) << key;
669 } 670 }
670 } 671 }
671 672
672 if (useValMap == true) 673 if (useValMap == true)
673 (*e) << valmap; 674 (*e) << valmap;
674 675