Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Molkentin <danimo@owncloud.com>2015-07-16 17:22:00 +0300
committerDaniel Molkentin <danimo@owncloud.com>2015-07-16 17:22:00 +0300
commitd53eaf8fd615e483e0216f70ac0017191f3665f7 (patch)
tree6922afe62e0270f116bcafba1e71997b5a16523a /cmake/modules/NSIS.template.in
parent2bcfb734b0ddeb688f42888d9efb818afc2cfbd7 (diff)
Win32: Remove confusing option to remove AppData
- This only works for the current user (while being a HKLM installer) - The naming is confusing. Fixes #3461
Diffstat (limited to 'cmake/modules/NSIS.template.in')
-rw-r--r--cmake/modules/NSIS.template.in41
1 files changed, 0 insertions, 41 deletions
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index e9da62c6e..28e71457c 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -89,7 +89,6 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
; Include some required header files.
;-----------------------------------------------------------------------------
!include LogicLib.nsh ;Used by APPDATA uninstaller.
-!include nsDialogs.nsh ;Used by APPDATA uninstaller.
!include MUI2.nsh ;Used by APPDATA uninstaller.
!include InstallOptions.nsh ;Required by MUI2 to support old MUI_INSTALLOPTIONS.
!include Memento.nsh ;Remember user selections.
@@ -145,7 +144,6 @@ Page custom PageReinstall PageLeaveReinstall
!insertmacro MUI_PAGE_FINISH
!endif
!insertmacro MUI_UNPAGE_CONFIRM
-UninstPage custom un.UnPageUserAppData un.UnPageUserAppDataLeave
!insertmacro MUI_UNPAGE_INSTFILES
;-----------------------------------------------------------------------------
@@ -594,40 +592,6 @@ SectionEnd
# #
##############################################################################
-Var UnPageUserAppDataDialog
-Var UnPageUserAppDataCheckbox
-Var UnPageUserAppDataCheckbox_State
-Var UnPageUserAppDataEditBox
-
-Function un.UnPageUserAppData
- !insertmacro MUI_HEADER_TEXT $UNINSTALLER_APPDATA_TITLE $UNINSTALLER_APPDATA_SUBTITLE
- nsDialogs::Create /NOUNLOAD 1018
- Pop $UnPageUserAppDataDialog
-
- ${If} $UnPageUserAppDataDialog == error
- Abort
- ${EndIf}
-
- ${NSD_CreateLabel} 0 0 100% 12u $UNINSTALLER_APPDATA_LABEL_1
- Pop $0
-
- ${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\${APPLICATION_NAME}"
- Pop $UnPageUserAppDataEditBox
- SendMessage $UnPageUserAppDataEditBox ${EM_SETREADONLY} 1 0
-
- ${NSD_CreateLabel} 0 46u 100% 24u $UNINSTALLER_APPDATA_LABEL_2
- Pop $0
-
- ${NSD_CreateCheckbox} 0 71u 100% 8u $UNINSTALLER_APPDATA_CHECKBOX
- Pop $UnPageUserAppDataCheckbox
-
- nsDialogs::Show
-FunctionEnd
-
-Function un.UnPageUserAppDataLeave
- ${NSD_GetState} $UnPageUserAppDataCheckbox $UnPageUserAppDataCheckbox_State
-FunctionEnd
-
Function un.EnsureOwncloudShutdown
!insertmacro CheckAndConfirmEndProcess "${APPLICATION_EXECUTABLE}"
FunctionEnd
@@ -705,11 +669,6 @@ Section Uninstall
;Remove all the Program Files.
RMDir /r $INSTDIR
- ;Uninstall User Data if option is checked, otherwise skip.
- ${If} $UnPageUserAppDataCheckbox_State == ${BST_CHECKED}
- RMDir /r "$LOCALAPPDATA\${APPLICATION_NAME}"
- ${EndIf}
-
DeleteRegKey ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}"
SetDetailsPrint textonly