From c4739415312aa0ee5d70fcb42327956b3f99e13f Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Fri, 13 Feb 2009 18:41:04 +0100
Subject: [PATCH] Remove all installed files and directories during
 uninstallation

Always try to remove the "jobs" subdirectory so that no empty
directory remains. Fix for bug 334. Remove the new DLLs libiconv-2.dll
and libintl-8.dll during uninstallation as well.
---
 installer/mkvtoolnix-unicode.nsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/installer/mkvtoolnix-unicode.nsi b/installer/mkvtoolnix-unicode.nsi
index cdf1db927..8a40a3177 100644
--- a/installer/mkvtoolnix-unicode.nsi
+++ b/installer/mkvtoolnix-unicode.nsi
@@ -242,7 +242,8 @@ Section Uninstall
   Delete "$INSTDIR\uninst.exe"
   Delete "$INSTDIR\libcharset.dll"
   Delete "$INSTDIR\libebml.dll"
-  Delete "$INSTDIR\libiconv.dll"
+  Delete "$INSTDIR\libiconv-2.dll"
+  Delete "$INSTDIR\libintl-8.dll"
   Delete "$INSTDIR\libmatroska.dll"
   Delete "$INSTDIR\matroskalogo_big.ico"
   Delete "$INSTDIR\mkvextract.exe"
@@ -308,7 +309,7 @@ Section Uninstall
   RMDir "$INSTDIR\doc"
   RMDir "$INSTDIR\examples"
 
-  StrCmp $unRemoveJobs "Yes" 0 +3
+  StrCmp $unRemoveJobs "Yes" 0 +2
   Delete "$INSTDIR\jobs\*.mmg"
   RMDir "$INSTDIR\jobs"