wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Applications/19.08'

Browse Source
wilder
Volker Krause 7 years ago
parent f3c17e11bb dcde6990cc
commit 59c47d4280
3 changed files with 29 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      CMakeLists.txt
  2. 8
      agents/followupreminderagent/jobs/followupreminderfinishtaskjob.cpp
  3. 6
      src/kontactplugin/kmail/kmail_plugin.cpp

44
CMakeLists.txt
Unescape View File

@ -42,19 +42,19 @@ endif()
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
set(AKONADI_MIMELIB_VERSION "5.11.80")
set(AKONADI_CONTACT_VERSION "5.11.80")
set(KCONTACTS_LIB_VERSION "5.11.80")
set(KCALENDARCORE_LIB_VERSION "5.11.80")
set(CALENDARUTILS_LIB_VERSION "5.11.80")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.11.80")
set(KLDAP_LIB_VERSION "5.11.80")
set(KMAILTRANSPORT_LIB_VERSION "5.11.80")
set(KONTACTINTERFACE_LIB_VERSION "5.11.80")
set(KMIME_LIB_VERSION "5.11.80")
set(KPIMTEXTEDIT_LIB_VERSION "5.11.80")
set(AKONADI_VERSION "5.11.80")
set(KTNEF_LIB_VERSION "5.11.80")
set(AKONADI_MIMELIB_VERSION "5.11.90")
set(AKONADI_CONTACT_VERSION "5.11.90")
set(KCONTACTS_LIB_VERSION "5.11.90")
set(KCALENDARCORE_LIB_VERSION "5.11.90")
set(CALENDARUTILS_LIB_VERSION "5.11.90")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.11.90")
set(KLDAP_LIB_VERSION "5.11.90")
set(KMAILTRANSPORT_LIB_VERSION "5.11.90")
set(KONTACTINTERFACE_LIB_VERSION "5.11.90")
set(KMIME_LIB_VERSION "5.11.90")
set(KPIMTEXTEDIT_LIB_VERSION "5.11.90")
set(AKONADI_VERSION "5.11.90")
set(KTNEF_LIB_VERSION "5.11.90")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5")
@ -65,18 +65,18 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branc
option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
set(LIBGRAVATAR_VERSION_LIB "5.11.80")
set(MAILCOMMON_LIB_VERSION_LIB "5.11.80")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.11.80")
set(MESSAGELIB_LIB_VERSION_LIB "5.11.80")
set(LIBKLEO_LIB_VERSION_LIB "5.11.80")
set(PIMCOMMON_LIB_VERSION_LIB "5.11.80")
set(LIBKDEPIM_LIB_VERSION_LIB "5.11.80")
set(LIBKSIEVE_LIB_VERSION_LIB "5.11.80")
set(LIBGRAVATAR_VERSION_LIB "5.11.90")
set(MAILCOMMON_LIB_VERSION_LIB "5.11.90")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.11.90")
set(MESSAGELIB_LIB_VERSION_LIB "5.11.90")
set(LIBKLEO_LIB_VERSION_LIB "5.11.90")
set(PIMCOMMON_LIB_VERSION_LIB "5.11.90")
set(LIBKDEPIM_LIB_VERSION_LIB "5.11.90")
set(LIBKSIEVE_LIB_VERSION_LIB "5.11.90")
find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5AkonadiSearch "5.11.80" CONFIG REQUIRED)
find_package(KF5AkonadiSearch "5.11.90" CONFIG REQUIRED)
set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
set(GPGMEPP_LIB_VERSION "1.11.1")

8
agents/followupreminderagent/jobs/followupreminderfinishtaskjob.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <AkonadiCore/ItemFetchJob>
#include <AkonadiCore/ItemModifyJob>
#include "followupreminderagent_debug.h"
#include <KCalCore/Todo>
#include <KCalendarCore/Todo>
FollowUpReminderFinishTaskJob::FollowUpReminderFinishTaskJob(Akonadi::Item::Id id, QObject *parent)
: QObject(parent)
@ -65,16 +65,16 @@ void FollowUpReminderFinishTaskJob::slotItemFetchJobDone(KJob *job)
const Akonadi::Item::List lst = qobject_cast<Akonadi::ItemFetchJob *>(job)->items();
if (lst.count() == 1) {
const Akonadi::Item item = lst.first();
if (!item.hasPayload<KCalCore::Todo::Ptr>()) {
if (!item.hasPayload<KCalendarCore::Todo::Ptr>()) {
qCDebug(FOLLOWUPREMINDERAGENT_LOG) << "FollowUpReminderFinishTaskJob::slotItemFetchJobDone: item is not a todo.";
Q_EMIT finishTaskFailed();
deleteLater();
return;
}
KCalCore::Todo::Ptr todo = item.payload<KCalCore::Todo::Ptr>();
KCalendarCore::Todo::Ptr todo = item.payload<KCalendarCore::Todo::Ptr>();
todo->setCompleted(true);
Akonadi::Item updateItem = item;
updateItem.setPayload<KCalCore::Todo::Ptr>(todo);
updateItem.setPayload<KCalendarCore::Todo::Ptr>(todo);
Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob(updateItem);
connect(job, &Akonadi::ItemModifyJob::result, this, &FollowUpReminderFinishTaskJob::slotItemModifiedResult);

6
src/kontactplugin/kmail/kmail_plugin.cpp
Unescape View File

@ -27,8 +27,8 @@
#include "summarywidget.h"
#include <KContacts/VCardDrag>
#include <KCalCore/MemoryCalendar>
#include <KCalCore/FileStorage>
#include <KCalendarCore/MemoryCalendar>
#include <KCalendarCore/FileStorage>
#include <KCalUtils/ICalDrag>
#include <KCalUtils/VCalDrag>
@ -45,7 +45,7 @@
#include <QStandardPaths>
using namespace KCalUtils;
using namespace KCalCore;
using namespace KCalendarCore;
EXPORT_KONTACT_PLUGIN(KMailPlugin, kmail)

Write Preview
Loading…
Cancel
Save