From 89aa339dd91765d67b4606938e60358f41d33884 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 25 Nov 2015 15:40:41 +0100
Subject: Fixed modifications.

Without this modifications are ignored also in incremental queries.
---
 common/facade.cpp | 6 +++---
 common/facade.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'common')

diff --git a/common/facade.cpp b/common/facade.cpp
index 68770b5..2806f4d 100644
--- a/common/facade.cpp
+++ b/common/facade.cpp
@@ -329,7 +329,7 @@ qint64 GenericFacade<DomainType>::load(const Akonadi2::Query &query, const std::
 
     QSet<QByteArray> remainingFilters;
     auto resultSet = baseSetRetriever(transaction, remainingFilters);
-    auto filteredSet = filterSet(resultSet, getFilter(remainingFilters, query), transaction, false);
+    auto filteredSet = filterSet(resultSet, getFilter(remainingFilters, query), transaction, initialQuery);
     replaySet(filteredSet, resultProvider);
     resultProvider.setRevision(Akonadi2::Storage::maxRevision(transaction));
     return Akonadi2::Storage::maxRevision(transaction);
@@ -343,7 +343,7 @@ qint64 GenericFacade<DomainType>::executeIncrementalQuery(const Akonadi2::Query
     Trace() << "Running incremental query " << baseRevision;
     return load(query, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
         return loadIncrementalResultSet(baseRevision, query, transaction, remainingFilters);
-    }, resultProvider);
+    }, resultProvider, false);
 }
 
 template<class DomainType>
@@ -361,7 +361,7 @@ qint64 GenericFacade<DomainType>::executeInitialQuery(const Akonadi2::Query &que
     }
     return load(modifiedQuery, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
         return loadInitialResultSet(modifiedQuery, transaction, remainingFilters);
-    }, resultProvider);
+    }, resultProvider, true);
 }
 
 template class Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Folder>;
diff --git a/common/facade.h b/common/facade.h
index 794e35e..df09d73 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -72,7 +72,7 @@ private:
 
     ResultSet filterSet(const ResultSet &resultSet, const std::function<bool(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &domainObject)> &filter, const Akonadi2::Storage::Transaction &transaction, bool initialQuery);
     std::function<bool(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &domainObject)> getFilter(const QSet<QByteArray> remainingFilters, const Akonadi2::Query &query);
-    qint64 load(const Akonadi2::Query &query, const std::function<ResultSet(Akonadi2::Storage::Transaction &, QSet<QByteArray> &)> &baseSetRetriever, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider);
+    qint64 load(const Akonadi2::Query &query, const std::function<ResultSet(Akonadi2::Storage::Transaction &, QSet<QByteArray> &)> &baseSetRetriever, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider, bool initialQuery);
     qint64 executeIncrementalQuery(const Akonadi2::Query &query, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider);
     qint64 executeInitialQuery(const Akonadi2::Query &query, const typename DomainType::Ptr &parent, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider);
 
-- 
cgit v1.2.3