- When showing the trash content, use the details view with path as default view

- Assure that the original path is shown for the trash protocol within Dolphin

svn path=/trunk/KDE/kdebase/apps/; revision=1198481

1 files changed, 6 insertions, 1 deletions

diff --git a/src/views/dolphinmodel.cpp b/src/views/dolphinmodel.cpp
index 5e62881a8..6474a4f3c 100644
--- a/src/views/dolphinmodel.cpp
+++ b/src/views/dolphinmodel.cpp
@@ -104,7 +104,12 @@ QVariant DolphinModel::data(const QModelIndex& index, int role) const
         case DolphinModel::LocalPathOrUrl:
             const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
             const KFileItem item = dirModel->itemForIndex(index);
-            return item.mostLocalUrl().directory();
+            const KUrl url = item.mostLocalUrl();
+            if (url.protocol() == QLatin1String("trash")) {
+                const KIO::UDSEntry udsEntry = item.entry();
+                return udsEntry.stringValue(KIO::UDSEntry::UDS_EXTRA);
+            }
+            return url.directory();
         }
         break;