X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=vlc.win32.nsi.in;h=5f8be712643e6c0404bb135c955881ae2beb1271;hb=b3621b5278e6b7a34f758d6a3b2e6cd3428e2c01;hp=37b81e506090cc16677eacdd07fb31ef64453a5b;hpb=0603924b22369d0028e426c345fca84f0c9e37d6;p=vlc

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index 37b81e5060..5f8be71264 100644
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -33,9 +33,9 @@ SetCompressor /SOLID lzma
 SetOverwrite ifnewer
 CRCCheck on
 
+InstType "Recommended"
 InstType "Minimum"
 InstType "Full"
-InstType "Recommended"
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; NSIS Modern User Interface configuration ;
@@ -197,7 +197,7 @@ FunctionEnd
 
 !macro RegisterExtensionSection EXT
   Section /o ${EXT}
-    SectionIn 2 3
+    SectionIn 1 3
     Push $R0
     StrCpy $R0 ${EXT}
     Call RegisterExtension
@@ -238,7 +238,7 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 !macro delprefs
-  SectionIn 2 3
+  SectionIn 1 3
   StrCpy $0 0
   !define Index 'Line${__LINE__}'
   "${Index}-Loop:"
@@ -394,11 +394,7 @@ Section "Start Menu Shortcut" SEC02a
   SectionIn 1 2 3
   CreateDirectory "$SMPROGRAMS\VideoLAN"
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \
-    "$INSTDIR\vlc.exe" "--intf wx --wx-embed"
-  CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (alt).lnk" \
-    "$INSTDIR\vlc.exe" "--intf wx --no-wx-embed"
-  CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (skins).lnk" \
-    "$INSTDIR\vlc.exe" "--intf skins"
+    "$INSTDIR\vlc.exe" "" 
   CreateShortCut "$SMPROGRAMS\VideoLAN\Reset VLC defaults and quit.lnk" \
     "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit "
   CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_NAME} Website.lnk" \
@@ -414,7 +410,7 @@ Section "Desktop Shortcut" SEC02b
 SectionEnd
 
 Section /o "Mozilla plugin" SEC03
-  SectionIn 2 3
+  SectionIn 1 3
 
   !insertmacro OpenUninstallLog
   !insertmacro InstallFolder mozilla
@@ -458,7 +454,7 @@ Section /o "Mozilla plugin" SEC03
 SectionEnd
 
 Section /o "ActiveX plugin" SEC04
-  SectionIn 2 3
+  SectionIn 1 3
   SetOutPath "$INSTDIR"
   !insertmacro OpenUninstallLog
   !insertmacro InstallFile activex\axvlc.dll
@@ -467,7 +463,7 @@ Section /o "ActiveX plugin" SEC04
 SectionEnd
 
 Section /o "Context Menus" SEC05
-  SectionIn 2
+  SectionIn 3
   !insertmacro MacroAllExtensions AddContextMenu
   !insertmacro AddContextMenu "Directory"
 SectionEnd
@@ -631,7 +627,6 @@ Section "Uninstall" SEC91
     ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"
     StrCmp $R2 "" "${Index}-Loop" ""
 
-    Delete "$R2\vlcintf.xpt"
     Delete "$R2\npvlc.dll"
     Goto "${Index}-Loop"
 
@@ -684,7 +679,7 @@ Section "Uninstall" SEC91
 SectionEnd
 
 Section /o "un.Delete preferences and cache" SEC92
-  SectionIn 2 3
+  SectionIn 1 3
   !insertmacro delprefs
 SectionEnd