Commit eb426ee1 authored by Grégory Oestreicher's avatar Grégory Oestreicher
Browse files

Merge remote-tracking branch 'origin/KDE/4.10'

parents 69f4fea0 f23ef9f6
......@@ -88,6 +88,7 @@ DavGroupwareResource::DavGroupwareResource( const QString &id )
cachePolicy.setSyncOnDemand( false );
cachePolicy.setCacheTimeout( -1 );
cachePolicy.setIntervalCheckTime( refreshInterval );
cachePolicy.setLocalParts( QStringList() << QLatin1String( "ALL" ) );
mDavCollectionRoot.setCachePolicy( cachePolicy );
changeRecorder()->fetchCollection( true );
......@@ -441,7 +442,12 @@ void DavGroupwareResource::onCollectionRemovedFinished( KJob *job )
}
Akonadi::Collection collection = job->property( "collection" ).value<Akonadi::Collection>();
mItemsRidCache.remove( collection.remoteId() );
if ( mItemsRidCache.contains( collection.remoteId() ) ) {
foreach ( const QString &rid, mItemsRidCache.value( collection.remoteId() ) ) {
mEtagCache.removeEtag( rid );
}
mItemsRidCache.remove( collection.remoteId() );
}
changeProcessed();
}
......@@ -816,6 +822,7 @@ void DavGroupwareResource::onItemRemovedFinished( KJob *job )
Akonadi::Item item = job->property( "item" ).value<Akonadi::Item>();
Akonadi::Collection collection = job->property( "collection" ).value<Akonadi::Collection>();
mItemsRidCache[collection.remoteId()].remove( item.remoteId() );
mEtagCache.removeEtag( item.remoteId() );
changeProcessed();
}
}
......
Supports Markdown
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