Branch 'kolab/integration/4.13.0' - akonadi/collectionfetchjob.cpp

[Christian Mollekopf]

 akonadi/collectionfetchjob.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 647e67d7405b6e3210bc82bd3896caab5e5c1557
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jan 2 16:15:47 2015 +0100

    CollectionFetchJob: Honor ignoreErrors also for the signals.

diff --git a/akonadi/collectionfetchjob.cpp b/akonadi/collectionfetchjob.cpp
index 1cd9d80..afc1727 100644
--- a/akonadi/collectionfetchjob.cpp
+++ b/akonadi/collectionfetchjob.cpp
@@ -78,7 +78,7 @@ public:
 
         mEmitTimer->stop(); // in case we are called by result()
         if (!mPendingCollections.isEmpty()) {
-            if (!q->error()) {
+            if (!q->error() || mScope.ignoreRetrievalErrors()) {
                 emit q->collectionsReceived(mPendingCollections);
             }
             mPendingCollections.clear();