From 2fbf8ab05211cfc2cff2425a3b2113c067097b3f Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com"
 <rob_strong%exchangecode.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 6 Feb 2007 05:04:25 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20369314=20=C2=96=20Trunk=20install=20takes?=
 =?UTF-8?q?=20over=20as=20default=20browser=20from=20a=20release=20build.?=
 =?UTF-8?q?=20Only=20take=20over=20specific=20protocol=20keys=20that=20fir?=
 =?UTF-8?q?efox.exe=20is=20already=20the=20default.=20r=3Dsspitzer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.0.0.236/trunk@219556 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/installer/windows/nsis/shared.nsh | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/mozilla/browser/installer/windows/nsis/shared.nsh b/mozilla/browser/installer/windows/nsis/shared.nsh
index 25db287f577..cc968da2089 100755
--- a/mozilla/browser/installer/windows/nsis/shared.nsh
+++ b/mozilla/browser/installer/windows/nsis/shared.nsh
@@ -360,33 +360,36 @@
   ${AddHandlerValues} "$0\FirefoxHTML" "$1" "$8,1" "${AppRegName} Document" "" "true"
 
   ReadRegStr $2 SHCTX "$0\http\shell\open\command" ""
-
   ClearErrors
   ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
-
-  ; If firefox.exe is in the http open command string set all system wide
-  ; default handlers.
   ${Unless} ${Errors}
-    WriteRegStr SHCTX "$0\.htm"   "" "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.html"  "" "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.shtml" "" "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.xht"   "" "FirefoxHTML"
-    WriteRegStr SHCTX "$0\.xhtml" "" "FirefoxHTML"
-
-    ${AddHandlerValues} "$0\gopher" "$1" "$8,0" "URL:Gopher Protocol" "true" "true"
-
-    ; An empty string is used for the 4th & 5th params because the following
-    ; protocol handlers already have a display name and additional keys required
-    ; for a protocol handler.
-    ${AddHandlerValues} "$0\ftp" "$1" "$8,0" "" "" "true"
     ${AddHandlerValues} "$0\http" "$1" "$8,0" "" "" "true"
+  ${EndUnless}
+
+  ReadRegStr $2 SHCTX "$0\https\shell\open\command" ""
+  ClearErrors
+  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
+  ${Unless} ${Errors}
     ${AddHandlerValues} "$0\https" "$1" "$8,0" "" "" "true"
+  ${EndUnless}
+
+  ReadRegStr $2 SHCTX "$0\ftp\shell\open\command" ""
+  ClearErrors
+  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
+  ${Unless} ${Errors}
+    ${AddHandlerValues} "$0\ftp" "$1" "$8,0" "" "" "true"
+  ${EndUnless}
+
+  ; Only set the gopher key if it doesn't already exist with a default value
+  ReadRegStr $2 SHCTX "$0\gopher" ""
+  ${If} $2 == ""
+    ${AddHandlerValues} "$0\gopher" "$1" "$8,0" "URL:Gopher Protocol" "true" "true"
   ${Else}
-    ; Only set the gopher key if it doesn't already exist with a default value
-    ReadRegStr $2 SHCTX "$0\gopher" ""
-    ${If} $2 == ""
+    ClearErrors
+    ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
+    ${Unless} ${Errors}
       ${AddHandlerValues} "$0\gopher" "$1" "$8,0" "URL:Gopher Protocol" "true" "true"
-    ${EndIf}
+    ${EndUnless}
   ${EndIf}
 !macroend
 !define FixClassKeys "!insertmacro FixClassKeys"