Merge branch 'jb43064-remove-desktop-mime-handler' into 'master'

[libcontentaction] Remove the MIME type handler for .desktop files. Fixes JB#43064 See merge request mer-core/libcontentaction!11
sailfishos · Feb 7, 2019 · 23e2f3b · 23e2f3b
2 parents 4b34183 + 5e3d702
commit 23e2f3b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/mime.cpp b/src/mime.cpp
@@ -407,10 +407,6 @@ Action Action::defaultActionForFile(const QUrl& fileUri, const QString& mimeType
     if (mimeType.isEmpty())
         return Action();
 
-    // We treat .desktop files specially: the default action (the only
-    // actually) is to launch the application it describes.
-    if (mimeType == DesktopFileMimeType)
-        return createAction(fileUri.toLocalFile(), QStringList());
     QString app = findDesktopFile(defaultAppForContentType(mimeType));
     if (!app.isEmpty()) {
         return createAction(app, QStringList() << fileUri.toEncoded());