summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Jarvie <djarvie@kde.org>2012-06-04 22:35:03 (GMT)
committerDavid Jarvie <djarvie@kde.org>2012-06-04 23:17:06 (GMT)
commit37458cc29f531186d7453ef955b7de330d02ecad (patch)
tree6271b21670054ee60da529dd12c118874f04bf7b
parent110b0a29428e7654a3995f7ac4be0019155f7027 (diff)
Bug 300083: Warn user clearly when Akonadi fails to run
Make it clear to the user, and prevent KAlarm being used, if Akonadi has failed to run. Backport of 19610d334206a88d11ea1aaa577d02e5b8869804 (master)
-rw-r--r--kalarm/Changelog5
-rw-r--r--kalarm/kalarm.h2
-rw-r--r--kalarm/mainwindow.cpp2
3 files changed, 7 insertions, 2 deletions
diff --git a/kalarm/Changelog b/kalarm/Changelog
index 3bf5db3..a275105 100644
--- a/kalarm/Changelog
+++ b/kalarm/Changelog
@@ -1,6 +1,9 @@
KAlarm Change Log
-=== Version 2.8.4 --- 29 May 2012 ===
+=== Version 2.8.5 --- 4 June 2012 ===
+- [Akonadi] Warn user and disable KAlarm if Akonadi fails to run.
+
+=== Version 2.8.4 (KDE 4.8.4) --- 29 May 2012 ===
- [Akonadi] Fix crash when saving new alarm.
=== Version 2.8.3 (KDE 4.8.3) --- 22 April 2012 ===
diff --git a/kalarm/kalarm.h b/kalarm/kalarm.h
index a24d138..3d3b720 100644
--- a/kalarm/kalarm.h
+++ b/kalarm/kalarm.h
@@ -28,7 +28,7 @@
#else
#define VERSION_SUFFIX "-res"
#endif
-#define KALARM_VERSION "2.8.4" VERSION_SUFFIX
+#define KALARM_VERSION "2.8.5" VERSION_SUFFIX
#define KALARM_NAME "KAlarm"
#define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index db7d11e..fdb3f19 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -54,6 +54,7 @@
#ifdef USE_AKONADI
#include <kcalcore/memorycalendar.h>
#include <kcalutils/icaldrag.h>
+#include <akonadi/control.h>
using namespace KCalCore;
using namespace KCalUtils;
#else
@@ -173,6 +174,7 @@ MainWindow::MainWindow(bool restored)
// Create the calendar resource selector widget
#ifdef USE_AKONADI
+ Akonadi::Control::widgetNeedsAkonadi(this);
mResourceSelector = new ResourceSelector(mSplitter);
#else
AlarmResources* resources = AlarmResources::instance();