summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Jarvie <djarvie@kde.org>2012-03-07 22:08:50 (GMT)
committerDavid Jarvie <djarvie@kde.org>2012-03-07 22:09:30 (GMT)
commitae66e32fb194e01e06521c78e9c72d772d291261 (patch)
tree6db636e166484cea248c2022907ad30c6b78c0b9
parentd7991f3ef7b6d8f5d2051004faacae08dab32100 (diff)
Fix error saving changed alarms when closing Edit Alarm dialogue
-rw-r--r--kalarm/Changelog6
-rw-r--r--kalarm/akonadimodel.cpp2
-rw-r--r--kalarm/kalarm.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/kalarm/Changelog b/kalarm/Changelog
index 4006481..1c26af6 100644
--- a/kalarm/Changelog
+++ b/kalarm/Changelog
@@ -1,6 +1,10 @@
KAlarm Change Log
-=== Version 2.8.1 --- 19 February 2012 ===
+=== Version 2.8.2 --- 7 March 2012 ===
+- [Akonadi] Fix error saving changed alarms when closing Edit Alarm dialogue.
+- [Akonadi] Show old-format calendars in read-only colour in calendar list.
+
+=== Version 2.8.1 (KDE 4.8.1) --- 19 February 2012 ===
- [Akonadi] Don't give option to save new alarms in old format calendars.
- [Akonadi] Prevent duplicate prompts to update format of new calendar resource.
- [Akonadi] Automatically disable duplicated calendar resources.
diff --git a/kalarm/akonadimodel.cpp b/kalarm/akonadimodel.cpp
index bb6ba60..2d7353b 100644
--- a/kalarm/akonadimodel.cpp
+++ b/kalarm/akonadimodel.cpp
@@ -1284,7 +1284,7 @@ KAEvent AkonadiModel::event(const Item& item, const QModelIndex& index, Collecti
if (e.isValid())
{
- Collection c = data(index, ParentCollectionRole).value<Collection>();
+ Collection c = data(ix, ParentCollectionRole).value<Collection>();
// Set collection ID using a const method, to avoid unnecessary copying of KAEvent
e.setCollectionId_const(c.id());
if (collection)
diff --git a/kalarm/kalarm.h b/kalarm/kalarm.h
index b78b0f5..568006f 100644
--- a/kalarm/kalarm.h
+++ b/kalarm/kalarm.h
@@ -28,7 +28,7 @@
#else
#define VERSION_SUFFIX "-res"
#endif
-#define KALARM_VERSION "2.8.1" VERSION_SUFFIX
+#define KALARM_VERSION "2.8.2" VERSION_SUFFIX
#define KALARM_NAME "KAlarm"
#define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application