From 32bf4827c45faf432593eb03432118e5436dded5 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Fri, 26 Jul 2013 15:05:40 +0200 Subject: Don't open .desktop files with http:/https: urls in Dolphin, open these urls in the default browser instead. BUG: 283475 BUG: 318217 FIXED-IN: 4.11.0 REVIEW: 111674 --- src/views/dolphinview.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/views/dolphinview.cpp') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index d54a101d8..bd311e4d3 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -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; + } } } } -- cgit v1.3 From 09bf5b66dc5136885c36e6b702047d56b627770d Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Mon, 29 Jul 2013 23:14:39 +0200 Subject: When pasting a folder and expanding it, do not select its children Thanks to Emmanuel for pointing out a problem with my first patch. BUG: 322965 FIXED-IN: 4.11.0 REVIEW: 111722 --- src/views/dolphinview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/views/dolphinview.cpp') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index bd311e4d3..20bc9f522 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -1099,7 +1099,7 @@ void DolphinView::slotAboutToCreate(const KUrl::List& urls) markUrlAsCurrent(urls.first()); m_markFirstNewlySelectedItemAsCurrent = false; } - m_selectedUrls << urls; + m_selectedUrls << KDirModel::simplifiedUrlList(urls); } } -- cgit v1.3