Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: pyhoca-gui.git - master (branch) updated: 0.2.0.4-81-g57ca969
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Thursday 15th November 2012 22:08:24 UTC (over 4 years ago)
The branch, master has been updated
       via  57ca969df9b1ceae6b35fd18ab786928aaf31ffe (commit)
      from  fe47e16bc886004ec63cb6313e7923abf7aeaaca (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 57ca969df9b1ceae6b35fd18ab786928aaf31ffe
Author: Mike Gabriel

Date:   Thu Nov 15 23:07:14 2012 +0100

    move macro insertions out of function

-----------------------------------------------------------------------

Summary of changes:
 nsis_template.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/nsis_template.py b/nsis_template.py
index f2cdb24..bb042b7 100644
--- a/nsis_template.py
+++ b/nsis_template.py
@@ -235,11 +235,6 @@ Function .onInit
         StrCmp $LANGUAGE "cancel" 0 +2
             Abort
 
-        !insertmacro MULTIUSER_INIT
-        !insertmacro MULTIUSER_PAGE_INSTALLMODE
-        !insertmacro MUI_PAGE_LICENSE
-        !insertmacro MUI_PAGE_DIRECTORY
-        !insertmacro MUI_PAGE_INSTFILES 
 
 FunctionEnd
 
@@ -257,6 +252,12 @@ FunctionEnd
 ;Page directory
 ;Page instfiles
 
+!insertmacro MULTIUSER_INIT
+!insertmacro MULTIUSER_PAGE_INSTALLMODE
+!insertmacro MUI_PAGE_LICENSE
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
 ;UninstPage uninstConfirm
 ;UninstPage instfiles
 


hooks/post-receive
 
CD: 3ms