diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-02 08:44:23 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-02 08:44:23 -0500 |
| commit | bf11e847fbe487eb1047c34ecfae674c1bef4c6d (patch) | |
| tree | 8bf4db2655463e06acc2a995e88fd6911330eed2 /konqueror/sidebar | |
| parent | 3e7ad37f5617f7f571fbd7b4aeba1d492271af33 (diff) | |
| download | tdebase-bf11e847fbe487eb1047c34ecfae674c1bef4c6d.tar.gz tdebase-bf11e847fbe487eb1047c34ecfae674c1bef4c6d.zip | |
Fix dirtree module stall due to unneeded mime magic calls
This resolves Bug 699
Diffstat (limited to 'konqueror/sidebar')
| -rw-r--r-- | konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index 4c54775dd..bff59f1a2 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -360,8 +360,8 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item ) if (! fileItem->isDir() ) { KMimeType::Ptr ptr; - - if ( fileItem->url().isLocalFile() && (((ptr=fileItem->determineMimeType())!=0) && (ptr->is("inode/directory") || m_showArchivesAsFolders) && ((!ptr->property("X-TDE-LocalProtocol").toString().isEmpty()) ))) { + + if ( fileItem->url().isLocalFile() && (((ptr=fileItem->mimeTypePtrFast())!=0) && (ptr->is("inode/directory") || m_showArchivesAsFolders) && ((!ptr->property("X-TDE-LocalProtocol").toString().isEmpty()) ))) { kdDebug()<<"Something not really a directory"<<endl; } else { // kdError() << "Item " << fileItem->url().prettyURL() << " is not a directory!" << endl; @@ -429,7 +429,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries ) if (! fileItem->isDir() ) { KMimeType::Ptr ptr; - if ( fileItem->url().isLocalFile() && (( (ptr=fileItem->determineMimeType())!=0) && (ptr->is("inode/directory") || m_showArchivesAsFolders) && ((!ptr->property("X-TDE-LocalProtocol").toString().isEmpty()) ))) { + if ( fileItem->url().isLocalFile() && (( (ptr=fileItem->mimeTypePtrFast())!=0) && (ptr->is("inode/directory") || m_showArchivesAsFolders) && ((!ptr->property("X-TDE-LocalProtocol").toString().isEmpty()) ))) { kdDebug()<<"Something really a directory"<<endl; } else { |