Commit 246b189b authored by Sergio Luis Martins's avatar Sergio Luis Martins
Browse files

Uncomment, ACL checking is working fine now.

svn path=/trunk/KDE/kdepim/runtime/; revision=1199122
parent 2257ae9a
......@@ -74,15 +74,13 @@ Akonadi::Item::List IncidenceHandler::translateItems(const Akonadi::Item::List &
<< "; collection has rights "
<< m_imapCollection.rights();
/*
const Akonadi::Collection::Rights requiredRights = Akonadi::Collection::CanDeleteItem |
Akonadi::Collection::CanCreateItem;
if ( ( m_imapCollection.rights() & requiredRights ) != requiredRights ) {
kDebug() << "Skipping conflict resolution, no rights on collection " << item.parentCollection().name();
kDebug() << "Skipping conflict resolution, no rights on collection " << m_imapCollection.name();
continue;
}*/
}
ConflictResolution res = resolveConflict(incidencePtr);
kDebug() << "ConflictResolution " << res;
......
......@@ -147,7 +147,6 @@ void KolabProxyResource::retrieveItems( const Collection &collection )
m_retrieveState = RetrieveItems;
ItemFetchJob *job = new ItemFetchJob( kolabToImap( collection ) );
job->fetchScope().fetchFullPayload();
job->fetchScope().setAncestorRetrieval( ItemFetchScope::Parent );
connect(job, SIGNAL(result(KJob*)), this, SLOT(retrieveItemFetchDone(KJob *)));
}
......@@ -159,7 +158,6 @@ bool KolabProxyResource::retrieveItem( const Item &item, const QSet<QByteArray>
m_retrieveState = RetrieveItem;
ItemFetchJob *job = new ItemFetchJob( kolabToImap( item ) );
job->fetchScope().fetchFullPayload();
job->fetchScope().setAncestorRetrieval( ItemFetchScope::Parent );
connect(job, SIGNAL(result(KJob*)), this, SLOT(retrieveItemFetchDone(KJob *)));
return true;
}
......
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