diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-01-12 10:48:05 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-01-12 10:48:05 +0100 |
commit | 1af958f5b178b9ed405f01f896d760e2a10d3942 (patch) | |
tree | 2070bb0950102629a104abe9634f923d3b57adb9 /examples/imapresource/imapresource.cpp | |
parent | ea6ac17473c1859327e430cf775e4fbd06067122 (diff) | |
download | sink-1af958f5b178b9ed405f01f896d760e2a10d3942.tar.gz sink-1af958f5b178b9ed405f01f896d760e2a10d3942.zip |
Only apply the name-based special purpose detection to top-level
folders.
Diffstat (limited to 'examples/imapresource/imapresource.cpp')
-rw-r--r-- | examples/imapresource/imapresource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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: | |||
107 | folder.setIcon("folder"); | 107 | folder.setIcon("folder"); |
108 | folder.setEnabled(f.subscribed); | 108 | folder.setEnabled(f.subscribed); |
109 | QHash<QByteArray, Query::Comparator> mergeCriteria; | 109 | QHash<QByteArray, Query::Comparator> mergeCriteria; |
110 | if (SpecialPurpose::isSpecialPurposeFolderName(f.name())) { | 110 | if (SpecialPurpose::isSpecialPurposeFolderName(f.name()) && parentFolderRid.isEmpty()) { |
111 | auto type = SpecialPurpose::getSpecialPurposeType(f.name()); | 111 | auto type = SpecialPurpose::getSpecialPurposeType(f.name()); |
112 | folder.setSpecialPurpose(QByteArrayList() << type); | 112 | folder.setSpecialPurpose(QByteArrayList() << type); |
113 | mergeCriteria.insert(ApplicationDomain::Folder::SpecialPurpose::name, Query::Comparator(type, Query::Comparator::Contains)); | 113 | mergeCriteria.insert(ApplicationDomain::Folder::SpecialPurpose::name, Query::Comparator(type, Query::Comparator::Contains)); |
@@ -116,7 +116,7 @@ public: | |||
116 | if (!parentFolderRid.isEmpty()) { | 116 | if (!parentFolderRid.isEmpty()) { |
117 | folder.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, parentFolderRid)); | 117 | folder.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, parentFolderRid)); |
118 | } | 118 | } |
119 | createOrModify(ENTITY_TYPE_FOLDER, remoteId, folder, mergeCriteria); | 119 | createOrModify(ApplicationDomain::getTypeName<ApplicationDomain::Folder>, remoteId, folder); |
120 | return remoteId; | 120 | return remoteId; |
121 | } | 121 | } |
122 | 122 | ||