Diffstat (limited to 'libkdepim/externalapphandler.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libkdepim/externalapphandler.cpp | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index edefda4..59be506 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -720,4 +720,6 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS | |||
720 | channel = KPimGlobalPrefs::instance()->mEmailOtherChannel; | 720 | channel = KPimGlobalPrefs::instance()->mEmailOtherChannel; |
721 | message2 = KPimGlobalPrefs::instance()->mEmailOtherMessage; | 721 | message = KPimGlobalPrefs::instance()->mEmailOtherMessage; |
722 | parameters2 = KPimGlobalPrefs::instance()->mEmailOtherMessageParameters; | 722 | message2 = KPimGlobalPrefs::instance()->mEmailOtherMessage2; |
723 | parameters = KPimGlobalPrefs::instance()->mEmailOtherMessageParameters; | ||
724 | parameters2 = KPimGlobalPrefs::instance()->mEmailOtherMessageParameters2; | ||
723 | } | 725 | } |
@@ -747,10 +749,20 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS | |||
747 | QProcess * proc = new QProcess( this ); | 749 | QProcess * proc = new QProcess( this ); |
748 | QStringList list = QStringList::split( " ", message ); | ||
749 | int i = 0; | 750 | int i = 0; |
750 | proc->addArgument( channel ); | 751 | proc->addArgument( channel ); |
752 | |||
753 | if ( message.find (" " ) > 0 ) { | ||
754 | QStringList list = QStringList::split( " ", message ); | ||
755 | int i = 0; | ||
751 | while ( i < list.count ( ) ) { | 756 | while ( i < list.count ( ) ) { |
752 | //qDebug("add%sdd ",list[i].stripWhiteSpace().latin1() ); | 757 | //qDebug("add%sdd ",list[i].latin1() ); |
753 | proc->addArgument( list[i].stripWhiteSpace() ); | 758 | proc->addArgument( list[i] ); |
759 | //KMessageBox::sorry( 0,list[i]); | ||
754 | ++i; | 760 | ++i; |
755 | } | 761 | } |
762 | } else { | ||
763 | proc->addArgument(message ); | ||
764 | //KMessageBox::sorry( 0, message ); | ||
765 | |||
766 | } | ||
767 | |||
756 | parameters2 = translateMessage(parameters2, urls, "" ); | 768 | parameters2 = translateMessage(parameters2, urls, "" ); |
@@ -759,2 +771,3 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS | |||
759 | 771 | ||
772 | //KMessageBox::sorry( 0,arg ); | ||
760 | //qDebug("2add%sdd ",arg.latin1() ); | 773 | //qDebug("2add%sdd ",arg.latin1() ); |
@@ -819,7 +832,8 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e | |||
819 | 832 | ||
820 | //KMessageBox::sorry( 0, message ); | 833 | //KMessageBox::sorry( 0,channel ); |
821 | QProcess * proc = new QProcess( this ); | 834 | QProcess * proc = new QProcess( this ); |
835 | proc->addArgument( channel ); | ||
836 | if ( message.find (" " ) > 0 ) { | ||
822 | QStringList list = QStringList::split( " ", message ); | 837 | QStringList list = QStringList::split( " ", message ); |
823 | int i = 0; | 838 | int i = 0; |
824 | proc->addArgument( channel ); | ||
825 | while ( i < list.count ( ) ) { | 839 | while ( i < list.count ( ) ) { |
@@ -827,4 +841,9 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e | |||
827 | proc->addArgument( list[i] ); | 841 | proc->addArgument( list[i] ); |
842 | //KMessageBox::sorry( 0,list[i]); | ||
828 | ++i; | 843 | ++i; |
829 | } | 844 | } |
845 | } else { | ||
846 | proc->addArgument(message ); | ||
847 | |||
848 | } | ||
830 | parameters = translateMessage(parameters, name, emailadress); | 849 | parameters = translateMessage(parameters, name, emailadress); |