[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.0.4-80-gfe47e16
X2Go dev team
git-admin at x2go.org
Thu Nov 15 23:05:11 CET 2012
The branch, master has been updated
via fe47e16bc886004ec63cb6313e7923abf7aeaaca (commit)
from ba2180e42bea8493a28f74eb3a038a5f6a4fb4ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fe47e16bc886004ec63cb6313e7923abf7aeaaca
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Nov 15 23:03:58 2012 +0100
remove redundancy in NSIS installer logic
-----------------------------------------------------------------------
Summary of changes:
nsis_template.py | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
The diff of changes is:
diff --git a/nsis_template.py b/nsis_template.py
index caa5508..f2cdb24 100644
--- a/nsis_template.py
+++ b/nsis_template.py
@@ -44,8 +44,8 @@ InstallDir $PROGRAMFILES\\{program_name}
; overwrite the old one automatically)
InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir"
-; Request application privileges for Windows Vista
-RequestExecutionLevel admin
+; OBSOLETE WITH MUI2: Request application privileges for Windows Vista
+;RequestExecutionLevel admin
!define MULTIUSER_EXECUTIONLEVEL Highest
!define MULTIUSER_MUI
@@ -236,6 +236,10 @@ Function .onInit
Abort
!insertmacro MULTIUSER_INIT
+ !insertmacro MULTIUSER_PAGE_INSTALLMODE
+ !insertmacro MUI_PAGE_LICENSE
+ !insertmacro MUI_PAGE_DIRECTORY
+ !insertmacro MUI_PAGE_INSTFILES
FunctionEnd
@@ -248,13 +252,13 @@ FunctionEnd
;--------------------------------
; Pages
-Page license
-Page components
-Page directory
-Page instfiles
+;Page license
+;Page components
+;Page directory
+;Page instfiles
-UninstPage uninstConfirm
-UninstPage instfiles
+;UninstPage uninstConfirm
+;UninstPage instfiles
;--------------------------------
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
More information about the x2go-commits
mailing list