From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 23 Sep 2008 23:46:07 +0000 (-0700)
Subject: Win32 Installer update:
X-Git-Tag: 1.0.0-pre1~2933
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=97a8b0fb564f9df63c58c9ee840d9e540ecae2a0;p=vlc

Win32 Installer update:

Deactivate ActiveX by default and
reordering of File Asssociation to be more visible.
---

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 134882b860..f3d9696bf0 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -547,8 +547,8 @@ Section /o $Name_Section03 SEC03
 
 SectionEnd
 
-Section $Name_Section04 SEC04
-  SectionIn 1 3
+Section /o $Name_Section04 SEC04
+  SectionIn 3
   SetOutPath "$INSTDIR"
   !insertmacro OpenUninstallLog
   !insertmacro InstallFile activex\axvlc.dll
@@ -556,7 +556,20 @@ Section $Name_Section04 SEC04
   RegDLL "$INSTDIR\axvlc.dll"
 SectionEnd
 
-Section $Name_Section05 SEC05
+SectionGroup /e !$Name_Section06 SEC05
+  SectionGroup $Name_SectionGroupAudio
+    !insertmacro MacroAudioExtensions RegisterExtensionSection
+  SectionGroupEnd
+  SectionGroup $Name_SectionGroupVideo
+    !insertmacro MacroVideoExtensions RegisterExtensionSection
+  SectionGroupEnd
+  SectionGroup $Name_SectionGroupOther
+    !insertmacro MacroOtherExtensions RegisterExtensionSection
+  SectionGroupEnd
+SectionGroupEnd
+
+
+Section $Name_Section05 SEC06
   SectionIn 1 2 3
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" $ContextMenuEntry_PlayWith
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \
@@ -591,25 +604,13 @@ Section $Name_Section05 SEC05
 
 SectionEnd
 
-SectionGroup $Name_Section06 SEC06
-  SectionGroup $Name_SectionGroupAudio
-    !insertmacro MacroAudioExtensions RegisterExtensionSection
-  SectionGroupEnd
-  SectionGroup $Name_SectionGroupVideo
-    !insertmacro MacroVideoExtensions RegisterExtensionSection
-  SectionGroupEnd
-  SectionGroup $Name_SectionGroupOther
-    !insertmacro MacroOtherExtensions RegisterExtensionSection
-  SectionGroupEnd
-SectionGroupEnd
-
 Section $Name_Section07 SEC07
-  SectionIn 3
+  SectionIn 1 3
   !insertmacro MacroAllExtensions AddContextMenu
   !insertmacro AddContextMenuExt "Directory"
 SectionEnd
 
-Section /o $Name_Section08 SEC08
+Section $Name_Section08 SEC08
   !insertmacro delprefs
 SectionEnd
 
@@ -629,7 +630,7 @@ SectionEnd
 ;;; Start function
 Function .onInit
   !insertmacro MUI_LANGDLL_DISPLAY
-  
+
   !include "languages\english.nsh"
   StrCmp $LANGUAGE ${LANG_FRENCH} French EndLanguageCmp
   French:
@@ -647,7 +648,7 @@ Function .onInit
     ClearErrors
     ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
   done:
-  
+
 FunctionEnd
 
 ;; End function