]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Don't open .desktop files with http:/https: urls in Dolphin,
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Fri, 26 Jul 2013 13:05:40 +0000 (15:05 +0200)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Fri, 26 Jul 2013 13:05:40 +0000 (15:05 +0200)
open these urls in the default browser instead.

BUG: 283475
BUG: 318217
FIXED-IN: 4.11.0
REVIEW: 111674

src/views/dolphinview.cpp

index d54a101d841a7f30bfb724e925aa79189612b47c..bd311e4d37197e1d92ea7202260210207cef4da1 100644 (file)
@@ -1254,10 +1254,13 @@ KUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
         }
 
         if (mimetype == QLatin1String("application/x-desktop")) {
-            // Redirect to the URL in Type=Link desktop files
+            // Redirect to the URL in Type=Link desktop files, unless it is a http(s) URL.
             KDesktopFile desktopFile(url.toLocalFile());
             if (desktopFile.hasLinkType()) {
-                return desktopFile.readUrl();
+                const QString linkUrl = desktopFile.readUrl();
+                if (!linkUrl.startsWith(QLatin1String("http"))) {
+                    return linkUrl;
+                }
             }
         }
     }