Commit 8c56d118 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/Applications/16.04'

parents 2ba3109a 7cf53cc9
KAlarm Change Log
=== Version 2.11.6 --- 20 April 2016 ===
=== Version 2.11.7 --- 11 June 2016 ===
- Always use current setting for email sender address when sending emails [KDE Bug 359163]
=== Version 2.11.6 (KDE Applications 16.04.1) --- 20 April 2016 ===
- Prevent KAlarm autostarting on non-KDE desktops if start-at-login is disabled.
=== Version 2.11.5 (KDE Applications 16.04.0) --- 13 April 2016 ===
......
......@@ -1228,7 +1228,7 @@ void EditEmailAlarmDlg::setAction(KAEvent::SubAction action, const AlarmText& al
void EditEmailAlarmDlg::setEmailFields(uint fromID, const KCalCore::Person::List& addresses,
const QString& subject, const QStringList& attachments)
{
if (fromID)
if (fromID && mEmailFromList)
mEmailFromList->setCurrentIdentity(fromID);
if (!addresses.isEmpty())
mEmailToEdit->setText(KAEvent::joinEmailAddresses(addresses, QStringLiteral(", ")));
......
......@@ -24,7 +24,7 @@
#undef QT3_SUPPORT
#define VERSION_SUFFIX "-5ak"
#define KALARM_VERSION "2.11.6" VERSION_SUFFIX
#define KALARM_VERSION "2.11.7" VERSION_SUFFIX
#define KALARM_NAME "KAlarm"
#define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application
......
/*
* kamail.cpp - email functions
* Program: kalarm
* Copyright © 2002-2015 by David Jarvie <djarvie@kde.org>
* Copyright © 2002-2016 by David Jarvie <djarvie@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -107,9 +107,9 @@ int KAMail::send(JobData& jobdata, QStringList& errmsgs)
{
QString err;
KIdentityManagement::Identity identity;
if (!jobdata.event.emailFromId())
jobdata.from = Preferences::emailAddress();
else
jobdata.from = Preferences::emailAddress();
if (jobdata.event.emailFromId()
&& Preferences::emailFrom() == Preferences::MAIL_FROM_KMAIL)
{
identity = Identities::identityManager()->identityForUoid(jobdata.event.emailFromId());
if (identity.isNull())
......
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