Commit 11a8eafc authored by Sergio Luis Martins's avatar Sergio Luis Martins
Browse files

Don't do conflict handling if we don't have permissions on the imap folder.

This was the 4.4 behaviour.

I'll uncomment this when i figure out why it's not working, doesn't ItemFetchJob set the collection's rights?

svn path=/trunk/KDE/kdepim/runtime/; revision=1198813
parent b9872921
......@@ -70,7 +70,19 @@ Akonadi::Item::List IncidenceHandler::translateItems(const Akonadi::Item::List &
<< " and the other imap item id is "
<< storedItem.id << "; imap collection is "
<< item.parentCollection().name()
<< item.parentCollection().id();
<< item.parentCollection().id()
<< "; collection has rights "
<< item.parentCollection().rights();
/*
const Akonadi::Collection::Rights requiredRights = Akonadi::Collection::CanDeleteItem |
Akonadi::Collection::CanCreateItem;
if ( ( item.parentCollection().rights() & requiredRights ) != requiredRights ) {
kDebug() << "Skipping conflict resolution, no rights on collection " << item.parentCollection().name();
continue;
}
*/
ConflictResolution res = resolveConflict(incidencePtr);
kDebug() << "ConflictResolution " << res;
......
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