From d7c710e5fcc47036a686b9fedb0b4ac96f94d9db Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sun, 9 Apr 2017 10:07:01 +0000
Subject: [PATCH] Remove oramod and orarep file type handlers.

---
 packaging/linux/openra-launch-mod.desktop | 12 ------------
 packaging/linux/openra-mimeinfo.xml       | 14 --------------
 packaging/linux/openra-replays.desktop    | 12 ------------
 packaging/windows/OpenRA.nsi              | 20 +++++++-------------
 4 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 packaging/linux/openra-launch-mod.desktop
 delete mode 100755 packaging/linux/openra-replays.desktop

diff --git a/packaging/linux/openra-launch-mod.desktop b/packaging/linux/openra-launch-mod.desktop
deleted file mode 100644
index a8d610e1bf..0000000000
--- a/packaging/linux/openra-launch-mod.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=OpenRA
-GenericName=Real Time Strategy Game
-Comment=Reimagining of early Westwood Games
-Icon=openra
-Exec=openra Game.Mod=%f
-Terminal=false
-NoDisplay=true
-Categories=Game;StrategyGame;
-MimeType=application/x-openra-mod;
\ No newline at end of file
diff --git a/packaging/linux/openra-mimeinfo.xml b/packaging/linux/openra-mimeinfo.xml
index 2042cb50f8..a7b7bb8b0a 100644
--- a/packaging/linux/openra-mimeinfo.xml
+++ b/packaging/linux/openra-mimeinfo.xml
@@ -1,20 +1,6 @@
 <?xml version="1.0"?>
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
 
-  <mime-type type="application/x-openra-replay">
-    <icon name="openra" />
-    <generic-icon name="applications-games"/>
-    <comment>OpenRA Replay</comment>
-    <glob weight="60" pattern="*.orarep"/>
-  </mime-type>
-
-  <mime-type type="application/x-openra-mod">
-    <icon name="openra" />
-    <generic-icon name="applications-games"/>
-    <comment>OpenRA Mod</comment>
-    <glob weight="60" pattern="*.oramod"/>
-  </mime-type>
-
   <mime-type type="x-scheme-handler/openra">
     <icon name="openra" />
     <generic-icon name="applications-games"/>
diff --git a/packaging/linux/openra-replays.desktop b/packaging/linux/openra-replays.desktop
deleted file mode 100755
index 58e8d9f637..0000000000
--- a/packaging/linux/openra-replays.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=OpenRA
-GenericName=Real Time Strategy Game
-Comment=Reimagining of early Westwood Games
-Icon=openra
-Exec=openra Launch.Replay=%f
-Terminal=false
-NoDisplay=true
-Categories=Game;StrategyGame;
-MimeType=application/x-openra-replay;
\ No newline at end of file
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 90bfc48ff1..3412c2e4d7 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -55,23 +55,19 @@ Section "-Reg" Reg
 
 	; Installation directory
 	WriteRegStr HKLM "Software\OpenRA" "InstallDir" $INSTDIR
-	
-	; Replay file association
-	WriteRegStr HKLM "Software\Classes\.orarep" "" "OpenRA_replay"
-	WriteRegStr HKLM "Software\Classes\OpenRA_replay\DefaultIcon" "" "$INSTDIR\OpenRA.ico,0"
-	WriteRegStr HKLM "Software\Classes\OpenRA_replay\Shell\Open\Command" "" "$INSTDIR\OpenRA.exe Launch.Replay=$\"%1$\""
-
-	; oramod file association
-	WriteRegStr HKLM "Software\Classes\.oramod" "" "OpenRA_mod"
-	WriteRegStr HKLM "Software\Classes\OpenRA_mod\DefaultIcon" "" "$INSTDIR\OpenRA.ico,0"
-	WriteRegStr HKLM "Software\Classes\OpenRA_mod\Shell\Open\Command" "" "$INSTDIR\OpenRA.exe Game.Mod=$\"%1$\""
 
 	; OpenRA URL Scheme
 	WriteRegStr HKLM "Software\Classes\openra" "" "URL:OpenRA scheme"
 	WriteRegStr HKLM "Software\Classes\openra" "URL Protocol" ""
 	WriteRegStr HKLM "Software\Classes\openra\DefaultIcon" "" "$INSTDIR\OpenRA.ico,0"
 	WriteRegStr HKLM "Software\Classes\openra\Shell\Open\Command" "" "$INSTDIR\OpenRA.exe Launch.URI=%1"
-	
+
+	; Remove obsolete file associations
+	DeleteRegKey HKLM "Software\Classes\.orarep"
+	DeleteRegKey HKLM "Software\Classes\OpenRA_replay"
+	DeleteRegKey HKLM "Software\Classes\.oramod"
+	DeleteRegKey HKLM "Software\Classes\OpenRA_mod"
+
 SectionEnd
 
 Section "Game" GAME
@@ -213,8 +209,6 @@ Function ${UN}Clean
 	RMDir /r $INSTDIR\Support
 
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA"
-	DeleteRegKey HKLM "Software\Classes\.orarep"
-	DeleteRegKey HKLM "Software\Classes\OpenRA_replay"
 	DeleteRegKey HKLM "Software\Classes\openra"
 
 	Delete $INSTDIR\uninstaller.exe