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

Don't add mime types to the root collection

This seem to have many side effects, and the issue
that this was meant to address seems to have been
fixed since.

BUG: 311240
BUG: 308835
BUG: 309372
FIXED-IN: 4.10.2
parent 38ce56b9
......@@ -476,8 +476,6 @@ void DavGroupwareResource::onRetrieveCollectionsFinished( KJob *job )
const DavCollection::List davCollections = fetchJob->collections();
QSet<QString> parentMimeTypes = QSet<QString>::fromList( mDavCollectionRoot.contentMimeTypes() );
foreach ( const DavCollection &davCollection, davCollections ) {
if ( mCollectionsWithTemporaryError.contains( davCollection.url() ) ) {
kWarning() << davCollection.url() << "is now available";
......@@ -522,7 +520,6 @@ void DavGroupwareResource::onRetrieveCollectionsFinished( KJob *job )
if ( contentTypes & DavCollection::Journal )
mimeTypes << KCalCore::Journal::journalMimeType();
parentMimeTypes += QSet<QString>::fromList( mimeTypes );
collection.setContentMimeTypes( mimeTypes );
setCollectionIcon( collection /*by-ref*/ );
......@@ -553,12 +550,6 @@ void DavGroupwareResource::onRetrieveCollectionsFinished( KJob *job )
collections << collection;
}
// Set the list of possible mimetypes on the root collection to be the union
// of all the possible mimetypes on all the child collections. This is
// necessary in order for the root collection to be displayed in certain
// views.
collections[0].setContentMimeTypes( parentMimeTypes.values() );
collectionsRetrieved( collections );
}
......
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