Try to fix error reported by Allen.

CCMAIL: winter@kde.org
Allen could you test it ?


svn path=/trunk/KDE/kdepim/; revision=998407
wilder-work
Laurent Montel 17 years ago
parent 3e0a43b442
commit c6c558ba14
  1. 2
      kmcomposewin.cpp
  2. 4
      stringutil.cpp
  3. 2
      stringutil.h
  4. 8
      util.cpp

@ -3645,7 +3645,7 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
mDisableBreaking = false;
return;
}
bool listIsEmpty;
QStringList listIsEmpty;
for ( QVector<KMMessage*>::iterator it = mComposedMessages.begin() ; it != mComposedMessages.end() ; ++it ) {
// remove fields that contain no data (e.g. an empty Cc: or Bcc:)

@ -856,7 +856,7 @@ bool addressIsInAddressList( const QString& address,
return false;
}
QString expandAliases( const QString& recipients, bool &distributionListIsEmpty )
QString expandAliases( const QString& recipients, QStringList &distributionListEmpty )
{
if ( recipients.isEmpty() )
return QString();
@ -870,9 +870,11 @@ QString expandAliases( const QString& recipients, bool &distributionListIsEmpty
QString receiver = (*it).trimmed();
// try to expand distribution list
bool distributionListIsEmpty = false;
QString expandedList = KPIM::KAddrBookExternal::expandDistributionList( receiver, distributionListIsEmpty );
if ( distributionListIsEmpty ) {
expandedRecipients += receiver;
distributionListEmpty << receiver;
continue;
}

@ -139,7 +139,7 @@ namespace StringUtil
* Expands aliases (distribution lists and nick names) and appends a
* domain part to all email addresses which are missing the domain part.
*/
QString expandAliases( const QString& recipients,bool &distributionListIsEmpty );
QString expandAliases( const QString& recipients,QStringList &distributionListIsEmpty );
/**
* Uses the hostname as domain part and tries to determine the real name

@ -135,12 +135,12 @@ bool KMail::Util::validateAddresses( QWidget *parent, const QString &addresses )
{
QString brokenAddress;
bool distributionListIsEmpty;
QStringList distributionListEmpty;
KPIMUtils::EmailParseResult errorCode =
KPIMUtils::isValidAddressList( StringUtil::expandAliases( addresses,distributionListIsEmpty ),
KPIMUtils::isValidAddressList( StringUtil::expandAliases( addresses,distributionListEmpty ),
brokenAddress );
if ( distributionListIsEmpty ) {
QString errorMsg = i18n( "Distribution list \"%1\" is empty. You can not use it.",addresses );
if ( !distributionListEmpty.isEmpty() ) {
QString errorMsg = i18n( "Distribution list \"%1\" is empty. You can not use it.", distributionListEmpty.join( ", " ) );
KMessageBox::sorry( parent , errorMsg, i18n("Invalid Email Address") );
return false;
}

Loading…
Cancel
Save