Commit ce23619f authored by David Jarvie's avatar David Jarvie

Don't show spurious extra calendar after adding new calendar

After adding a new calendar, the calendar list showed two entries
for the new calendar, one labelled "akonadi_kalarm_resource_*" and
with invalid details.

BUG: 361543
parent 93df7e2b
KAlarm Change Log
=== Version 2.11.5 --- 11 April 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]
=== 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]
......
......@@ -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)
......
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