| bf11e847 | 2014-10-02 08:44:23 | Timothy Pearson |
Fix dirtree module stall due to unneeded mime magic calls This resolves Bug 699 |
||
|
M konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp |
||
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index 4c54775..bff59f1 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -360,8 +360,8 @@
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 @@
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 {
|
||
| c6c4c0e2 | 2014-10-02 08:45:03 | Timothy Pearson |
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase |
||
|
M admin M cmake M doc/releasenotes/index.docbook |
||
diff --git a/admin b/admin index 92ee091..4dd97fa 160000 --- a/admin +++ b/admin -Subproject commit 92ee091d6ecb323af421834d2926f2d920035adc +Subproject commit 4dd97fad9e0c3f39abfd16d13e5b4c93d508513c diff --git a/cmake b/cmake index 38a8a33..0d5ca8b 160000 --- a/cmake +++ b/cmake -Subproject commit 38a8a335c362b35f41603024bbf63b0d074b9a41 +Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9 diff --git a/doc/releasenotes/index.docbook b/doc/releasenotes/index.docbook index 2c36685..9520f56 100644 --- a/doc/releasenotes/index.docbook +++ b/doc/releasenotes/index.docbook @@ -204,6 +204,9 @@ Faster startup and logout. </para></listitem> <listitem><para> +Improved Konqueror speed for listing files in folder. +</para></listitem> +<listitem><para> Ability to force Kate into MDI mode all the time. </para></listitem> <listitem><para> @@ -271,6 +274,9 @@ </para></listitem> <listitem><para> A smooth crossfade effect is now available when changing the desktop wallpaper. +</para></listitem> +<listitem><para> +Fixed Konqueror selection handling when using arrow keys. </para></listitem> </itemizedlist> @@ -588,6 +594,9 @@ knetworkmanager -> tdenetworkmanager </para></listitem> <listitem><para> +knewstuff -> tdenewstuff +</para></listitem> +<listitem><para> kpowersave -> tdepowersave </para></listitem> <listitem><para> |
||