Branch 'kolab/integration/4.13.0' - resources/kolab
Christian Mollekopf
mollekopf at kolabsys.com
Wed May 21 19:11:56 CEST 2014
resources/kolab/kolabhelpers.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit ee89b1e57b001ce3533647198ba00db6cd7f9812
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Wed May 21 18:20:19 2014 +0200
Kolab-Resource: Ignore flag changes and don't accidentaly create mails.
We used to create mails on flag changes because the rid based merge would fail
due to the wrong mimetype.
diff --git a/resources/kolab/kolabhelpers.cpp b/resources/kolab/kolabhelpers.cpp
index db54d49..b4fb0c6 100644
--- a/resources/kolab/kolabhelpers.cpp
+++ b/resources/kolab/kolabhelpers.cpp
@@ -52,15 +52,16 @@ Akonadi::Item KolabHelpers::translateFromImap(Kolab::FolderType folderType, cons
return imapItem;
}
- //No payload, probably a flag change or alike, we just pass it through
+ //No payload, so it's a flag change. We ignore flag changes on groupware data.
if (!imapItem.hasPayload()) {
- return imapItem;
+ ok = false;
+ return Akonadi::Item();
}
if (!imapItem.hasPayload<KMime::Message::Ptr>()) {
kWarning() << "Payload is not a MessagePtr!";
Q_ASSERT(false);
ok = false;
- return imapItem;
+ return Akonadi::Item();
}
const KMime::Message::Ptr payload = imapItem.payload<KMime::Message::Ptr>();
More information about the commits
mailing list