diff -r c18f9fa7f42e -r 640d30f4fb64 phonebookengines/cntactions/src/cntemailaction.cpp --- a/phonebookengines/cntactions/src/cntemailaction.cpp Fri Oct 08 11:42:51 2010 +0300 +++ b/phonebookengines/cntactions/src/cntemailaction.cpp Fri Oct 15 12:24:46 2010 +0300 @@ -68,7 +68,8 @@ m_request = m_AppManager.create(XQI_EMAIL_MESSAGE_SEND, "send(QVariant)", true); if (m_request) { - QMap map; + QVariantMap dataMap; + QVariantMap emailMap; QStringList recipients; QList data; @@ -76,16 +77,32 @@ if (QContactType::TypeGroup == m_contact.type()) { QStringList emails; QVariant value = m_data.value("email"); - if (value.canConvert()) { - emails = value.toStringList(); + if (value.canConvert()) { + emailMap = value.toMap(); } - if (!emails.isEmpty()) { - for (int i=0;i()) + displayLabel = i.value().toString(); + + // Email addresses format string: + // Firstname Lastname + if (!displayLabel.isEmpty()) + formatString += displayLabel + " "; + formatString += "<" + emailAddress + ">"; + recipients.append(formatString); + + ++i; } - map.insert(EMAIL_SEND_TO_KEY, recipients); - data.append(map); + dataMap.insert(EMAIL_SEND_TO_KEY, recipients); + data.append(dataMap); m_request->setArguments(data); m_request->send(retValue); @@ -100,9 +117,17 @@ else if (m_detail.definitionName() == QContactEmailAddress::DefinitionName) { const QContactEmailAddress &email = static_cast(m_detail); - recipients.append(email.emailAddress()); - map.insert(EMAIL_SEND_TO_KEY, recipients); - data.append(map); + // Email addresses format string: + // Firstname Lastname + QString formatString; + QString displayLabel = m_contact.displayLabel(); + if (!displayLabel.isEmpty()) + formatString += displayLabel + " "; + formatString += "<" + email.emailAddress() + ">"; + + recipients.append(formatString); + dataMap.insert(EMAIL_SEND_TO_KEY, recipients); + data.append(dataMap); m_request->setArguments(data); m_request->send(retValue);