Commit a561526a authored by Daniel Vrátil's avatar Daniel Vrátil 🤖

Merge branch 'Applications/17.04'

parents 36486b72 580ef344
......@@ -143,7 +143,11 @@ set_package_properties(Sasl2 PROPERTIES
)
# Extra package
<<<<<<< HEAD
find_package(KPimGAPI "5.5.40" CONFIG)
=======
find_package(KPimGAPI "5.5.2" CONFIG)
>>>>>>> Applications/17.04
add_subdirectory(resources)
......
......@@ -56,6 +56,13 @@ void RetrieveCollectionsTask::doStart(KIMAP::Session *session)
policy.setInheritFromParent(false);
policy.setSyncOnDemand(true);
// The first in the list of namespaces is User namespace
// If the user namespace is empty, then make it possible for user to create
// new folders as children of the root folder
if (serverNamespaces().value(0).name.isEmpty()) {
root.setRights(Akonadi::Collection::CanCreateCollection);
}
QStringList localParts;
localParts << QLatin1String(Akonadi::MessagePart::Envelope)
<< QLatin1String(Akonadi::MessagePart::Header);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment