[ekiga/gnome-2-26] [windows] Cleanup build program

[Eugen Dedu <ededu src gnome org>]

commit 41966f7a7d3453e72fbb19165329bd520d40ceb8
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Sun May 9 22:55:50 2010 +0200

    [windows] Cleanup build program

 win32/nsisinstaller/ekiga.nsi |   62 +++++++++++++++++++---------------------
 1 files changed, 29 insertions(+), 33 deletions(-)
---
diff --git a/win32/nsisinstaller/ekiga.nsi b/win32/nsisinstaller/ekiga.nsi
index 826e854..a6aec8c 100644
--- a/win32/nsisinstaller/ekiga.nsi
+++ b/win32/nsisinstaller/ekiga.nsi
@@ -10,7 +10,6 @@
 var name
 var GTK_FOLDER
 var STARTUP_RUN_KEY
-var ISSILENT
 var ALREADY_INSTALLED
 ; ===========================
 ; Configuration
@@ -112,7 +111,8 @@ OutFile "${TARGET_DIR}/ekiga-setup-${EKIGA_VERSION}-nogtk.exe"
 !insertmacro EKIGA_MACRO_INCLUDE_LANGFILE "ENGLISH"		"${INSTALLER_DIR}/language_files/english.nsh"
 
 ; ===========================
-; Sections
+; Section SecUninstallOldEkiga
+; ===========================
 Section -SecUninstallOldEkiga
         ; Check install rights..
         Call CheckUserInstallRights
@@ -179,8 +179,9 @@ Section -SecUninstallOldEkiga
         done:
 SectionEnd
 
-
-
+; ===========================
+; Section SecGtk
+; ===========================
 !ifdef WITH_GTK
 Section $(GTK_SECTION_TITLE) SecGtk
   SectionIn 1 RO
@@ -207,14 +208,14 @@ Section $(GTK_SECTION_TITLE) SecGtk
   no_gtk:
     StrCmp $R1 "NONE" gtk_no_install_rights
     ClearErrors
-    ExecWait '"$TEMP\${GTK_RUNTIME_INSTALLER}" /L=$LANGUAGE $ISSILENT /DIR="$GTK_FOLDER" /IGNOREERRORS'
+    ExecWait "$TEMP\${GTK_RUNTIME_INSTALLER}"
     Goto gtk_install_cont
 
   upgrade_gtk:
     StrCpy $GTK_FOLDER $R6
     MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done
     ClearErrors
-    ExecWait '"$TEMP\${GTK_RUNTIME_INSTALLER}" /L=$LANGUAGE $ISSILENT /DIR="$GTK_FOLDER" /IGNOREERRORS'
+    ExecWait "$TEMP\${GTK_RUNTIME_INSTALLER}"
     Goto gtk_install_cont
 
   gtk_install_cont:
@@ -249,7 +250,7 @@ Section $(GTK_SECTION_TITLE) SecGtk
     ; Install GTK+ to Ekiga install dir
     StrCpy $GTK_FOLDER $INSTDIR
     ClearErrors
-    ExecWait '"$TEMP\${GTK_RUNTIME_INSTALLER}" /L=$LANGUAGE $ISSILENT /DIR="$GTK_FOLDER" /IGNOREERRORS'
+    ExecWait "$TEMP\${GTK_RUNTIME_INSTALLER}"
     IfErrors gtk_install_error
     SetOverwrite on
     ClearErrors
@@ -266,9 +267,9 @@ Section $(GTK_SECTION_TITLE) SecGtk
 SectionEnd ; end of GTK+ section
 !endif
 
-;--------------------------------
-;Ekiga Install Section
-
+; ===========================
+; Section SecEkiga
+; ===========================
 Section $(EKIGA_SECTION_TITLE) SecEkiga
   SectionIn 1 RO
 
@@ -371,9 +372,9 @@ Section $(EKIGA_SECTION_TITLE) SecEkiga
   done:
 SectionEnd ; end of default Ekiga section
 
-;--------------------------------
-;Shortcuts
-
+; ===========================
+; Shortcuts
+; ===========================
 SubSection /e $(EKIGA_SHORTCUTS_SECTION_TITLE) SecShortcuts
   Section $(EKIGA_DESKTOP_SHORTCUT_SECTION_TITLE) SecDesktopShortcut
     SetOutPath "$INSTDIR"
@@ -402,10 +403,9 @@ SubSection /e $(EKIGA_SHORTCUTS_SECTION_TITLE) SecShortcuts
 SubSectionEnd
 
 
-;--------------------------------
-;Uninstaller Section
-
-
+; ===========================
+; Section Uninstall
+; ===========================
 Section Uninstall
   Call un.CheckUserInstallRights
   Pop $R0
@@ -464,13 +464,9 @@ Section Uninstall
   done:
 SectionEnd ; end of uninstall section
 
-; ///////////////////////////////////////
-;; Functions
-; ///////////////////////////////////////
-
 ; ===========================
-; Init Global parameters
-
+; Function .onInit
+; ===========================
 Function .onInit
   Push $R0
   SystemLocal::Call 'kernel32::CreateMutexA(i 0, i 0, t "ekiga_installer_running") i .r1 ?e'
@@ -482,12 +478,6 @@ Function .onInit
 
   StrCpy $name "Ekiga"
 
-  StrCpy $ISSILENT "/NOUI"
-
-  ; GTK installer has two silent states.. one with Message boxes, one without
-  ; If ekiga installer was run silently, we want to supress gtk installer msg boxes.
-  StrCpy $ISSILENT "/SILENT"
-
   ${GetParameters} $R0
   ClearErrors
   ; if you wish to start with another language, execute for example:
@@ -537,6 +527,7 @@ FunctionEnd
 ; ===========================
 ; Check if another instance
 ; of the installer is running
+; ===========================
 !macro RunCheckMacro UN
 Function ${UN}RunCheck
   Push $R0
@@ -596,7 +587,9 @@ FunctionEnd
 !insertmacro CheckUserInstallRightsMacro ""
 !insertmacro CheckUserInstallRightsMacro "un."
 
-;
+; ===========================
+; Function doWeNeedGtk
+; ===========================
 ; Usage:
 ; Call DoWeNeedGtk
 ; First Pop:
@@ -640,7 +633,6 @@ Function DoWeNeedGtk
     StrCpy $5 "HKLM"
     StrCmp $0 "" no_gtk have_gtk
 
-
   have_gtk:
     ; GTK+ is already installed.. check version.
     ${VersionCompare} ${GTK_VERSION} $0 "$2"
@@ -693,6 +685,9 @@ Function DoWeNeedGtk
   Pop $3
 FunctionEnd
 
+; ===========================
+; Function preWelcomePage
+; ===========================
 !ifndef WITH_GTK
 Function preWelcomePage
   ; If this installer dosn't have GTK, check whether we need it.
@@ -712,8 +707,9 @@ Function preWelcomePage
 FunctionEnd
 !endif
 
-;--------------------------------
-;Descriptions
+; ===========================
+; Descriptions
+; ===========================
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecEkiga} $(EKIGA_SECTION_DESCRIPTION)
 !ifdef WITH_GTK