Commit 93bfa62f authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Remove USE_AKONADI

parent 62830d49
......@@ -8,13 +8,6 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
set(CMAKE_AUTOMOC_RELAXED_MODE ON)
add_definitions(-DUSE_AKONADI)
if (NOT CMAKE_VERSION VERSION_LESS 2.8.12 AND (CMAKE_VERSION VERSION_LESS 2.8.12.1
OR CMAKE_VERSION VERSION_LESS 2.8.13 # Temporary measure because build.kde.org uses a datestamped CMake version
))
# http://public.kitware.com/Bug/view.php?id=14535
set(CMAKE_AUTOMOC_MOC_OPTIONS -DUSE_AKONADI)
endif()
kde_enable_exceptions()
......
......@@ -1919,39 +1919,9 @@ KAlarm::UpdateResult sendToKOrganizer(const KAEvent& event)
KAlarm::UpdateResult deleteFromKOrganizer(const QString& eventID)
{
const QString newID = uidKOrganizer(eventID);
#if defined(USE_AKONADI) && KDE_IS_VERSION(4,12,4) // kdepimlibs/kdepim-runtime 4.12.4 are required
new CollectionSearch(KORG_MIME_TYPE, newID, true); // this auto-deletes when complete
// Ignore errors
return KAlarm::UpdateResult(KAlarm::UPDATE_OK);
#else
KAlarm::UpdateResult status = runKOrganizer(); // start KOrganizer if it isn't already running, and create its D-Bus interface
if (status != KAlarm::UPDATE_OK)
return status;
QList<QVariant> args;
args << newID << true;
QDBusReply<bool> reply = korgInterface->callWithArgumentList(QDBus::Block, QLatin1String("deleteIncidence"), args);
if (!reply.isValid())
{
if (reply.error().type() == QDBusError::UnknownObject)
{
kError() << "deleteIncidence() D-Bus error: still starting";
status = KAlarm::UPDATE_KORG_ERRSTART;
}
else
{
status.set(KAlarm::UPDATE_KORG_ERR, reply.error().message());
kError() << "deleteIncidence(" << newID << ") D-Bus call failed:" << status.message;
}
}
else if (!reply.value())
{
status = KAlarm::UPDATE_KORG_FUNCERR;
kDebug() << "deleteIncidence(" << newID << ") D-Bus call returned false";
}
else
kDebug() << newID << ": success";
return status;
#endif
}
/******************************************************************************
......
......@@ -23,11 +23,7 @@
#undef QT3_SUPPORT
#ifdef USE_AKONADI
#define VERSION_SUFFIX "-ak"
#else
#define VERSION_SUFFIX "-res"
#endif
#define KALARM_VERSION "2.10.9" VERSION_SUFFIX
#define KALARM_NAME "KAlarm"
......
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