Bug 627848 - Start menu shortcut isn't migrated as implemented in bug 598779. r=Mossop, a=blocking2.0-betaN

browser/installer/windows/nsis/installer.nsi

@@ -105,7 +105,6 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
 !insertmacro CleanUpdatesDir
 !insertmacro CopyFilesFromDir
 !insertmacro CreateRegKey
-!insertmacro FindSMProgramsDir
 !insertmacro GetPathFromString
 !insertmacro GetParent
 !insertmacro IsHandlerForInstallDir

browser/installer/windows/nsis/shared.nsh

@@ -626,7 +626,7 @@
   ${GetShortcutsLogPath} $0
   ${If} ${FileExists} "$0"
     ClearErrors
-    ReadINIStr $1 "$0" "SMPROGRAMS" "RelativePathToDir"
+    ReadINIStr $5 "$0" "SMPROGRAMS" "RelativePathToDir"
     ${Unless} ${Errors}
       ClearErrors
       ReadINIStr $1 "$0" "STARTMENU" "Shortcut0"
@@ -634,7 +634,7 @@
         ; The STARTMENU ini section doesn't exist.
         ${LogStartMenuShortcut} "${BrandFullName}.lnk"
         ${GetLongPath} "$SMPROGRAMS" $2
-        ${GetLongPath} "$2\$1" $1
+        ${GetLongPath} "$2\$5" $1
         ${If} "$1" != ""
           ClearErrors
           ReadINIStr $3 "$0" "SMPROGRAMS" "Shortcut0"

browser/installer/windows/nsis/uninstaller.nsi

@@ -90,7 +90,6 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
 !insertmacro AddDDEHandlerValues
 !insertmacro CleanVirtualStore
 !insertmacro ElevateUAC
-!insertmacro FindSMProgramsDir
 !insertmacro GetLongPath
 !insertmacro GetPathFromString
 !insertmacro IsHandlerForInstallDir