From 2d73f97d34d3fffaa64c4b6ed1f089f87e87d874 Mon Sep 17 00:00:00 2001 From: Martin Dosch Date: Fri, 10 Jul 2020 16:55:00 +0200 Subject: [PATCH] Removed compenent section This section was only introduced to be able to disable the OpenPGP plugin as Dino often crashed on Windows if OpenPGP was not installed but the plugin enabled. This is no more necessary as the OpenPGP plugin is now disabled by default. --- windows-installer/dino.nsi | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/windows-installer/dino.nsi b/windows-installer/dino.nsi index 997ec69c..b493f3af 100644 --- a/windows-installer/dino.nsi +++ b/windows-installer/dino.nsi @@ -14,7 +14,6 @@ InstType "OpenPGP support" IT_PGP # Modern Interface !include "MUI2.nsh" !insertmacro MUI_PAGE_LICENSE "input/LICENSE_SHORT" -!insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_INSTFILES !include "english.nsh" !include "german.nsh" @@ -30,20 +29,9 @@ InstallDir $PROGRAMFILES64\dino Section -# Install all files but openpgp.dll +# Install all files SetOutPath $INSTDIR -File /r input/bin -File input/LICENSE -File input/logo.ico -File input/logo.svg -File /r input/share -SetOutPath $INSTDIR\lib -File /r input/lib/gio -File /r input/lib/gdk-pixbuf-2.0 -SetOutPath $INSTDIR\lib\dino\plugins -File input/lib/dino/plugins/http-files.dll -File input/lib/dino/plugins/omemo.dll -File input/lib/dino/plugins/win32-fonts.dll +File /r input/ # define uninstaller name WriteUninstaller $INSTDIR\uninstaller.exe @@ -57,12 +45,6 @@ CreateShortcut "$SMPROGRAMS\Dino\Dino website.lnk" "https://dino.im" "" "$INSTDI SectionEnd -Section "OpenPGP support" -SectionInstType ${IT_PGP} -SetOutPath $INSTDIR/lib/dino/plugins -File input/lib/dino/plugins/openpgp.dll -SectionEnd - # Uninstaller section Section "Uninstall"