Commit 238050af authored by Laurent Montel's avatar Laurent Montel 😁

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

parents 29fa3c53 4d25621b
KAlarm Change Log
=== Version 2.11.4 --- 1 February 2016 ===
=== Version 2.11.5 --- 13 April 2016 ===
- Fix alarm times out by an hour in daylight savings time (needs kcalcore 16.04) [KDE Bug 336738]
- Don't show spurious extra calendar after adding new calendar [KDE Bug 361543]
- Fix crash when adding new calendar [KDE Bugs 361539, 361717]
=== Version 2.11.4 (KDE Applications 15.12.3) --- 1 February 2016 ===
- Fix reminder time edit being covered by 'in advance' combo [KDE Bug 357018]
- Fix crash after editing an alarm, if spell check is enabled [KDE Bug 356048]
- Fix occasional crash on startup [KDE Bug 358217]
......
......@@ -124,6 +124,8 @@ bool CollectionMimeTypeFilterModel::filterAcceptsRow(int sourceRow, const QModel
AkonadiModel* model = AkonadiModel::instance();
const QModelIndex ix = model->index(sourceRow, 0, sourceParent);
const Collection collection = model->data(ix, AkonadiModel::CollectionRole).value<Collection>();
if (collection.remoteId().isEmpty())
return false; // invalidly configured resource
if (!AgentManager::self()->instance(collection.resource()).isValid())
return false;
if (!mWritableOnly && mAlarmType == CalEvent::EMPTY)
......@@ -395,6 +397,7 @@ bool CollectionCheckListModel::setData(const QModelIndex& index, const QVariant&
*/
void CollectionCheckListModel::slotRowsInserted(const QModelIndex& parent, int start, int end)
{
Q_EMIT layoutAboutToBeChanged();
for (int row = start; row <= end; ++row)
{
const QModelIndex ix = mapToSource(index(row, 0, parent));
......
......@@ -24,7 +24,7 @@
#undef QT3_SUPPORT
#define VERSION_SUFFIX "-5ak"
#define KALARM_VERSION "2.11.4" VERSION_SUFFIX
#define KALARM_VERSION "2.11.5" VERSION_SUFFIX
#define KALARM_NAME "KAlarm"
#define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application
......
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