[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-baseapps/frameworks] lib/konq/src: Fix 'Show Original File'.
From:       Eike Hein <hein () kde ! org>
Date:       2015-12-12 22:39:47
Message-ID: E1a7spP-0004OL-DH () scm ! kde ! org
[Download RAW message or body]

Git commit c8bffa4e4dbf53ad174ea88c0216a8b87eb1f77f by Eike Hein.
Committed on 12/12/2015 at 22:38.
Pushed by hein into branch 'frameworks'.

Fix 'Show Original File'.

Put in correct branch instead.

CCMAIL:aacid@kde.org

M  +6    -7    lib/konq/src/konq_popupmenu.cpp

http://commits.kde.org/kde-baseapps/c8bffa4e4dbf53ad174ea88c0216a8b87eb1f77f

diff --git a/lib/konq/src/konq_popupmenu.cpp b/lib/konq/src/konq_popupmenu.cpp
index 7745b53..be34b8e 100644
--- a/lib/konq/src/konq_popupmenu.cpp
+++ b/lib/konq/src/konq_popupmenu.cpp
@@ -632,14 +632,13 @@ void KonqPopupMenuPrivate::addPlugins()
 void KonqPopupMenuPrivate::slotShowOriginalFile()
 {
     const KFileItem item = m_popupItemProperties.items().first();
-    const QString dest = item.linkDest();
-    QUrl destUrl = m_sViewURL;
-    if (dest.startsWith('/')) {
-        destUrl.setPath(dest);
-    } else {
-        destUrl.setPath(destUrl.path() + '/' + dest);
+    QUrl destUrl = QUrl::fromLocalFile(item.linkDest());
+
+    if (!destUrl.isValid()) {
+        return;
     }
+
     // Now destUrl points to the target file, let's go up to parent dir
     destUrl = destUrl.adjusted(QUrl::RemoveFilename);
-    KRun::runUrl(destUrl, "inode/directory", m_parentWidget);
+    KRun::runUrl(destUrl, QStringLiteral("inode/directory"), m_parentWidget);
 }
[prev in list] [next in list] [prev in thread] [next in thread]