Commit cddea235 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/20.04'

parents 04b6e824 d7d676b3
cmake_minimum_required(VERSION 3.5)
set(PIM_VERSION "5.14.42")
set(PIM_VERSION "5.14.43")
project(libkdepim VERSION ${PIM_VERSION})
......
......@@ -91,7 +91,7 @@ public:
q->connect(itemModifyJob, &Akonadi::ItemModifyJob::result, q, [this](KJob *itemModifyJob) {
Akonadi::ItemModifyJob *modifiedJob = static_cast<Akonadi::ItemModifyJob *>(itemModifyJob);
if (!modifiedJob->error()) {
Q_EMIT q->contactUpdated(modifiedJob->item(), messageId);
Q_EMIT q->contactUpdated(modifiedJob->item(), messageId, mShowAsHTML, mRemoteContent);
}
slotAddModifyContactDone(itemModifyJob);
});
......@@ -124,7 +124,7 @@ public:
q->connect(itemModifyJob, &Akonadi::ItemModifyJob::result, q, [this](KJob *itemModifyJob) {
Akonadi::ItemModifyJob *modifiedJob = static_cast<Akonadi::ItemModifyJob *>(itemModifyJob);
if (!modifiedJob->error()) {
Q_EMIT q->contactUpdated(modifiedJob->item(), messageId);
Q_EMIT q->contactUpdated(modifiedJob->item(), messageId, mShowAsHTML, mRemoteContent);
}
slotAddModifyContactDone(itemModifyJob);
});
......@@ -250,7 +250,7 @@ public:
q->connect(createJob, &Akonadi::ItemCreateJob::result, q, [this](KJob *createJob) {
Akonadi::ItemCreateJob *modifiedJob = static_cast<Akonadi::ItemCreateJob *>(createJob);
if (!modifiedJob->error()) {
Q_EMIT q->contactUpdated(modifiedJob->item(), messageId);
Q_EMIT q->contactUpdated(modifiedJob->item(), messageId, mShowAsHTML, mRemoteContent);
}
slotAddModifyContactDone(createJob);
});
......
......@@ -49,7 +49,7 @@ public:
void start() override;
Q_SIGNALS:
void contactUpdated(const Akonadi::Item &contact, Akonadi::Item::Id id);
void contactUpdated(const Akonadi::Item &contact, Akonadi::Item::Id id, bool showAsHTML, bool remoteContent);
private:
//@cond PRIVATE
......
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