From c63ab673e1f1a09862d500400cb4cc3713dbc46e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 7 Feb 2015 23:24:27 +0100
Subject: [PATCH] Revert "Add freedesktop.org mimeinfo for OpenMW save game
 files"

This reverts commit 94002b0758a8825215074b5341b6ec6b0cd28660.

Conflicts:
	CMakeLists.txt
---
 CMakeLists.txt            |  3 ---
 files/openmw-mimeinfo.xml | 11 -----------
 files/openmw.desktop      | 13 -------------
 3 files changed, 27 deletions(-)
 delete mode 100644 files/openmw-mimeinfo.xml

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab4363e2e..d22e0b129 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -371,8 +371,6 @@ configure_file(${OpenMW_SOURCE_DIR}/files/opencs/defaultfilters
 if (NOT WIN32 AND NOT APPLE)
     configure_file(${OpenMW_SOURCE_DIR}/files/openmw.desktop
         "${OpenMW_BINARY_DIR}/openmw.desktop")
-    configure_file(${OpenMW_SOURCE_DIR}/files/openmw-mimeinfo.xml
-        "${OpenMW_BINARY_DIR}/openmw-mimeinfo.xml")
     configure_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.desktop
         "${OpenMW_BINARY_DIR}/openmw-cs.desktop")
 endif()
@@ -441,7 +439,6 @@ IF(NOT WIN32 AND NOT APPLE)
 
     # Install icon and desktop file
     INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.desktop" DESTINATION "${DATAROOTDIR}/applications" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
-    INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-mimeinfo.xml" DESTINATION "${DATAROOTDIR}/mime/packages" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
     INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
     IF(BUILD_OPENCS)
         INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.desktop" DESTINATION "${DATAROOTDIR}/applications" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "opencs")
diff --git a/files/openmw-mimeinfo.xml b/files/openmw-mimeinfo.xml
deleted file mode 100644
index 1355383a5..000000000
--- a/files/openmw-mimeinfo.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-
-  <mime-type type="application/x-openmw-savegame">
-    <icon name="openmw" />
-    <generic-icon name="applications-games"/>
-    <comment>OpenMW Savegame</comment>
-    <glob weight="60" pattern="*.omwsave"/>
-  </mime-type>
-
-</mime-info>
diff --git a/files/openmw.desktop b/files/openmw.desktop
index 6d64c5a7c..36d01b33e 100644
--- a/files/openmw.desktop
+++ b/files/openmw.desktop
@@ -8,16 +8,3 @@ TryExec=openmw-launcher
 Exec=openmw-launcher
 Icon=openmw
 Categories=Game;RolePlaying;
-
-[Desktop Entry]
-Type=Application
-Name=OpenMW
-GenericName=Role Playing Game
-Comment=An engine replacement for The Elder Scrolls III: Morrowind
-Keywords=Morrowind;Reimplementation Mods;esm;bsa;
-Exec=openmw --load-savegame=%f
-Icon=openmw
-Categories=Game;RolePlaying;
-Terminal=false
-NoDisplay=true
-MimeType=application/x-openmw-savegame;