summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-10-29 17:26:07 (UTC)
committer zautrix <zautrix>2005-10-29 17:26:07 (UTC)
commita4f17bd35c56280c45bda847b42b7d3a003b0a42 (patch) (side-by-side diff)
treed0bc9ec6a81ecfb272c88248614f633835c454e8
parent898dbabef6d747447999add46201315d04f85f63 (diff)
downloadkdepimpi-a4f17bd35c56280c45bda847b42b7d3a003b0a42.zip
kdepimpi-a4f17bd35c56280c45bda847b42b7d3a003b0a42.tar.gz
kdepimpi-a4f17bd35c56280c45bda847b42b7d3a003b0a42.tar.bz2
commit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/externalapphandler.cpp41
1 files changed, 30 insertions, 11 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index edefda4..59be506 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -715,14 +715,16 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS
int client = KPimGlobalPrefs::instance()->mEmailClient;
if (client == KPimGlobalPrefs::OTHER_EMC)
{
channel = KPimGlobalPrefs::instance()->mEmailOtherChannel;
- message2 = KPimGlobalPrefs::instance()->mEmailOtherMessage;
- parameters2 = KPimGlobalPrefs::instance()->mEmailOtherMessageParameters;
+ message = KPimGlobalPrefs::instance()->mEmailOtherMessage;
+ message2 = KPimGlobalPrefs::instance()->mEmailOtherMessage2;
+ parameters = KPimGlobalPrefs::instance()->mEmailOtherMessageParameters;
+ parameters2 = KPimGlobalPrefs::instance()->mEmailOtherMessageParameters2;
}
else
{
DefaultAppItem* dai = getDefaultItem(EMAIL, client);
if (!dai)
{
@@ -742,24 +744,35 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS
qDebug("4Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message2.latin1());
qDebug("passing emailadresses(%s), attachmenturls(%s) as parameters in the form %s to QCopEnvelope", emails.latin1() , urls.latin1(), parameters2.latin1());
#endif
qDebug("%s --- %s %s --- %s %s", channel.latin1(), message.latin1(),message2.latin1(), parameters.latin1(), parameters2.latin1() );
//KMessageBox::sorry( 0, message2 );
QProcess * proc = new QProcess( this );
- QStringList list = QStringList::split( " ", message );
int i = 0;
proc->addArgument( channel );
- while ( i < list.count ( ) ) {
- //qDebug("add%sdd ",list[i].stripWhiteSpace().latin1() );
- proc->addArgument( list[i].stripWhiteSpace() );
+
+ if ( message.find (" " ) > 0 ) {
+ QStringList list = QStringList::split( " ", message );
+ int i = 0;
+ while ( i < list.count ( ) ) {
+ //qDebug("add%sdd ",list[i].latin1() );
+ proc->addArgument( list[i] );
+ //KMessageBox::sorry( 0,list[i]);
++i;
+ }
+ } else {
+ proc->addArgument(message );
+ //KMessageBox::sorry( 0, message );
+
}
+
parameters2 = translateMessage(parameters2, urls, "" );
QString arg = "to='%1'";
arg = arg.arg( emails ) + ","+parameters2;;
+ //KMessageBox::sorry( 0,arg );
//qDebug("2add%sdd ",arg.latin1() );
proc->addArgument( arg);
proc->launch("");
#endif
return true;
@@ -814,21 +827,27 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e
QCopEnvelope e(channel.latin1(), message.latin1());
//US we need no names in the To field. The emailadresses are enough
passParameters(&e, parameters, name, emailadress);
#else // DESKTOP_VERSION
- //KMessageBox::sorry( 0, message );
+ //KMessageBox::sorry( 0,channel );
QProcess * proc = new QProcess( this );
- QStringList list = QStringList::split( " ", message );
- int i = 0;
proc->addArgument( channel );
- while ( i < list.count ( ) ) {
+ if ( message.find (" " ) > 0 ) {
+ QStringList list = QStringList::split( " ", message );
+ int i = 0;
+ while ( i < list.count ( ) ) {
//qDebug("add%sdd ",list[i].latin1() );
proc->addArgument( list[i] );
+ //KMessageBox::sorry( 0,list[i]);
++i;
+ }
+ } else {
+ proc->addArgument(message );
+
}
parameters = translateMessage(parameters, name, emailadress);
proc->addArgument( parameters );
proc->launch("");
#endif
@@ -900,13 +919,13 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber )
qDebug("passing phonenumber(%s) as parameter in the form %s to QCopEnvelope", phonenumber.latin1(), parameters.latin1());
#endif
QCopEnvelope e(channel.latin1(), message.latin1());
//US we need no names in the To field. The emailadresses are enough
- passParameters(&e, parameters, phonenumber, "");
+ passParameters(&e, parameters, phonenumber, "");
#else
KMessageBox::sorry( 0, i18n( "This version does not support phonecalls." ) );
#endif