From 1af958f5b178b9ed405f01f896d760e2a10d3942 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 12 Jan 2017 10:48:05 +0100
Subject: Only apply the name-based special purpose detection to top-level
 folders.

---
 examples/imapresource/imapresource.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples/imapresource/imapresource.cpp')

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 8ada325..49639c3 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -107,7 +107,7 @@ public:
         folder.setIcon("folder");
         folder.setEnabled(f.subscribed);
         QHash<QByteArray, Query::Comparator> mergeCriteria;
-        if (SpecialPurpose::isSpecialPurposeFolderName(f.name())) {
+        if (SpecialPurpose::isSpecialPurposeFolderName(f.name()) && parentFolderRid.isEmpty()) {
             auto type = SpecialPurpose::getSpecialPurposeType(f.name());
             folder.setSpecialPurpose(QByteArrayList() << type);
             mergeCriteria.insert(ApplicationDomain::Folder::SpecialPurpose::name, Query::Comparator(type, Query::Comparator::Contains));
@@ -116,7 +116,7 @@ public:
         if (!parentFolderRid.isEmpty()) {
             folder.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, parentFolderRid));
         }
-        createOrModify(ENTITY_TYPE_FOLDER, remoteId, folder, mergeCriteria);
+        createOrModify(ApplicationDomain::getTypeName<ApplicationDomain::Folder>, remoteId, folder);
         return remoteId;
     }
 
-- 
cgit v1.2.3