Branch 'kolab/integration/4.13.0' - resources/kolab
Christian Mollekopf
mollekopf at kolabsys.com
Wed Jan 7 14:57:32 CET 2015
resources/kolab/tagchangehelper.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 31e50d4733bc2250741816998a931c62c0b43cdd
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Wed Jan 7 14:55:05 2015 +0100
Really only update the remote id.
Necessary to avoid bouncing tag changes back and forth between resources.
diff --git a/resources/kolab/tagchangehelper.cpp b/resources/kolab/tagchangehelper.cpp
index 641c8e9..73e8c78 100644
--- a/resources/kolab/tagchangehelper.cpp
+++ b/resources/kolab/tagchangehelper.cpp
@@ -113,8 +113,11 @@ void TagChangeHelper::recordNewUid(qint64 newUid, Akonadi::Tag tag)
const QByteArray remoteId = QByteArray::number(newUid);
kDebug(5327) << "Setting remote ID to " << remoteId << " on tag with local id: " << tag.id();
- tag.setRemoteId(remoteId);
- Akonadi::TagModifyJob *modJob = new Akonadi::TagModifyJob(tag);
+ //Make sure we only update the id and send nothing else
+ Akonadi::Tag updateTag;
+ updateTag.setId(tag.id());
+ updateTag.setRemoteId(remoteId);
+ Akonadi::TagModifyJob *modJob = new Akonadi::TagModifyJob(updateTag);
connect(modJob, SIGNAL(result(KJob*)), this, SLOT(onModifyDone(KJob*)));
}
More information about the commits
mailing list