┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Frese <[email protected]>2008-03-05 00:17:53 +0000
committerNorbert Frese <[email protected]>2008-03-05 00:17:53 +0000
commit7a1992e86b6c112b1dab9817ddcfb90e3d574a57 (patch)
treeef77a4a0af5dc676704ccd2f1f146b9efedd5184
parent488ab56d0ae698c872137cceea6b18af5fb96730 (diff)
Make Konqueror and Dolphin use the new KFileItem::targetUrl() method.
svn path=/trunk/KDE/kdebase/apps/; revision=782396
-rw-r--r--src/dolphinpart.cpp2
-rw-r--r--src/dolphinviewcontainer.cpp4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 9ed69bddf..aa1bb6d7c 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -273,7 +273,7 @@ void DolphinPart::slotItemTriggered(const KFileItem& item)
} else {
// Left button. [Right button goes to slotOpenContextMenu before triggered can be emitted]
kDebug() << "LMB";
- emit m_extension->openUrlRequest(item.url(), args, browserArgs);
+ emit m_extension->openUrlRequest(item.targetUrl(), args, browserArgs);
}
}
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 47fd01eaf..237aa19f5 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -392,9 +392,7 @@ void DolphinViewContainer::saveRootUrl(const KUrl& url)
void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
{
- // Prefer the local path over the URL.
- bool isLocal;
- KUrl url = item.mostLocalUrl(isLocal);
+ KUrl url = item.targetUrl();
if (item.isDir()) {
m_view->setUrl(url);