Branch 'kolab/integration/4.13.0' - akonadi/monitor_p.cpp
Christian Mollekopf
mollekopf at kolabsys.com
Tue Jan 27 17:14:16 CET 2015
akonadi/monitor_p.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8363dcf220b0713d7b8a24b9442718645ab6577a
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Tue Jan 27 16:43:33 2015 +0100
Monitor: Emit tag removed signals including rid.
Previously we setup a tag with remoteid, but then emitted a signal
without rid anyways.
diff --git a/akonadi/monitor_p.cpp b/akonadi/monitor_p.cpp
index 9b7958a..eeb9ddc 100644
--- a/akonadi/monitor_p.cpp
+++ b/akonadi/monitor_p.cpp
@@ -1081,10 +1081,10 @@ bool MonitorPrivate::emitTagsNotification(const NotificationMessageV3 &msg, cons
Tag::List validTags;
if (msg.operation() == NotificationMessageV2::Remove) {
//In case of a removed signal the cache entry was already invalidated, and we therefore received an empty list of tags
- Q_FOREACH (const Entity::Id &uid, msg.uids()) {
- Tag tag(uid);
- tag.setRemoteId(msg.entity(uid).remoteId.toLatin1());
- validTags << Tag(uid);
+ Q_FOREACH (const Akonadi::NotificationMessageV2::Entity &entity, msg.entities()) {
+ Tag tag(entity.id);
+ tag.setRemoteId(entity.remoteId.toLatin1());
+ validTags << tag;
}
} else {
validTags = tags;
More information about the commits
mailing list