From 94b9c740f8db0751382bc78178c044553ad2f0d7 Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com"
 <rob_strong%exchangecode.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 12 Jun 2006 18:33:07 +0000
Subject: [PATCH] Bug 341226 - Set program access is unaware of all users vs.
 current user. r=sspitzer

git-svn-id: svn://10.0.0.236/trunk@199731 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../windows/nsis/SetProgramAccess.nsi         | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/mozilla/browser/installer/windows/nsis/SetProgramAccess.nsi b/mozilla/browser/installer/windows/nsis/SetProgramAccess.nsi
index 632f401fbd7..a6be8a85387 100755
--- a/mozilla/browser/installer/windows/nsis/SetProgramAccess.nsi
+++ b/mozilla/browser/installer/windows/nsis/SetProgramAccess.nsi
@@ -60,6 +60,7 @@ Function un.SetAccess
   Pop $R0
 
   StrCpy $R1 "Software\Clients\StartMenuInternet\${FileMainEXE}\InstallInfo"
+  SetShellVarContext all  ; Set $DESKTOP to All Users
 
   ; Hide icons - initiated from Set Program Access and Defaults
   ${If} $R0 == '/ua "${AppVersion} (${AB_CD})" /hs browser'
@@ -72,6 +73,10 @@ Function un.SetAccess
       ${EndIf}
     ${EndIf}
 
+    ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"
+      SetShellVarContext current  ; Set $DESKTOP to the current user's desktop
+    ${EndUnless}
+
     ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"
       ShellLink::GetShortCutTarget "$DESKTOP\${BrandFullName}.lnk"
       Pop $0
@@ -86,8 +91,18 @@ Function un.SetAccess
   ; Show icons - initiated from Set Program Access and Defaults
   ${If} $R0 == '/ua "${AppVersion} (${AB_CD})" /ss browser'
     WriteRegDWORD HKLM $R1 "IconsVisible" 1
-    CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
-    CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
+    ${Unless} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk"
+      CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
+    ${EndUnless}
+    ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"
+      CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
+      ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"
+        SetShellVarContext current  ; Set $DESKTOP to the current user's desktop
+        ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"
+          CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
+        ${EndUnless}
+      ${EndUnless}
+    ${EndUnless}
     Abort
   ${EndIf}
 FunctionEnd