Make Konqueror and Dolphin use the new KFileItem::targetUrl() method.

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

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 9ed69bddfbac3297aa2787bf98245271268ca440..aa1bb6d7c419f3da13ff34ba68291fd6a3e5a60a 100644 (file)
--- 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";
     } 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 47fd01eaf92b9ecd4751f2ea2109d60e71a7fef9..237aa19f50e621caaeb19f0439939f22a7f59359 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -392,9 +392,7 @@ void DolphinViewContainer::saveRootUrl(const KUrl& url)
 
 void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
 {
 
 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);
 
     if (item.isDir()) {
         m_view->setUrl(url);