Commit 78cd7e9f authored by Laurent Montel's avatar Laurent Montel 😁

Add new api

parent 28222508
......@@ -136,7 +136,7 @@ else()
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.56")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.79")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
......
......@@ -44,7 +44,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${accountwizard_SOURCE_DIR})
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml DBus Test)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.56")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.79")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
......
......@@ -42,7 +42,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akonadiconsole_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.79")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(KCALENDARCORE_LIB_VERSION "5.2.40")
......
......@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
find_package(Grantlee5 "5.1" CONFIG REQUIRED)
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.79")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
......@@ -39,7 +39,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${blogilo_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql WebEngine WebEngineWidgets)
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.79")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80")
# Find KF5 package
find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
......
......@@ -29,7 +29,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${grantleeditor_SOURCE_DIR})
set(KDEPIM_VERSION_NUMBER "5.2.49")
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.79")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
......@@ -41,7 +41,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.56")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.79")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.40")
......
......@@ -63,7 +63,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
set(LIBGRAVATAR_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.56")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.79")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
......
......@@ -2441,8 +2441,14 @@ void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method,
params.setSubject(subject());
params.setHtmlMail(mComposerBase->editor()->textMode() == MessageComposer::RichTextComposerNg::Rich);
params.setIdentity(mComposerBase->identityCombo()->currentIdentity());
const KIdentityManagement::Identity &ident = KMKernel::self()->identityManager()->identityForUoid(mComposerBase->identityCombo()->currentIdentity());
QString defaultDomainName;
if (!ident.isNull()) {
defaultDomainName = ident.defaultDomainName();
}
const QStringList recipients = { mComposerBase->to().trimmed(), mComposerBase->cc().trimmed(), mComposerBase->bcc().trimmed()};
params.setAddresses(recipients);
params.setDefaultDomain(defaultDomainName);
if (!mPluginEditorCheckBeforeSendManagerInterface->execute(params)) {
return;
......@@ -2452,11 +2458,6 @@ void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method,
// Validate the To:, CC: and BCC fields
AddressValidationJob *job = new AddressValidationJob(recipients.join(QStringLiteral(", ")), this, this);
const KIdentityManagement::Identity &ident = KMKernel::self()->identityManager()->identityForUoid(mComposerBase->identityCombo()->currentIdentity());
QString defaultDomainName;
if (!ident.isNull()) {
defaultDomainName = ident.defaultDomainName();
}
job->setDefaultDomain(defaultDomainName);
job->setProperty("method", static_cast<int>(method));
job->setProperty("saveIn", static_cast<int>(saveIn));
......
......@@ -34,7 +34,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR})
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.79")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.80")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKSIEVE_LIB_VERSION_LIB "5.2.44")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment