Bug 552118 - File association icon for HTML and .eml files is set to a generic icon, r=Neil, a=Callek
authorFrank Wein <mcsmurf@mcsmurf.de>
Sat, 24 Sep 2011 18:54:43 +0200
changeset 8852 37ad99156e2a4038dad9ccb720f5fa0cb162180a
parent 8851 12eb54a1b68002e61c1a7955789522b6f65909de
child 8853 4bc1aa261198535fbcf0a8b291050fbc547fe675
push idunknown
push userunknown
push dateunknown
reviewersNeil, Callek
bugs552118
Bug 552118 - File association icon for HTML and .eml files is set to a generic icon, r=Neil, a=Callek
suite/installer/windows/nsis/installer.nsi
suite/installer/windows/nsis/shared.nsh
--- a/suite/installer/windows/nsis/installer.nsi
+++ b/suite/installer/windows/nsis/installer.nsi
@@ -408,17 +408,17 @@ Section "-Application" APP_IDX
   StrCpy $1 "$\"$8$\" -requestPending -osint -url $\"%1$\""
   StrCpy $2 "$\"%1$\",,0,0,,,," 
   StrCpy $3 "$\"$8$\"  -url $\"%1$\""
   ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
 
   ; An empty string is used for the 5th param because SeaMonkeyHTML is not a
   ; protocol handler
   ${AddHandlerValues} "SOFTWARE\Classes\SeaMonkeyHTML" "$3" \
-                      "$INSTDIR\chrome\icons\default\html-file.ico" \
+                      "$INSTDIR\chrome\icons\default\html-file.ico,0" \
                       "${AppRegName} Document" "" ""
   ${AddDDEHandlerValues} "SeaMonkeyURL" "$1" "$8,0" "${AppRegName} URL" "" \
                          "${DDEApplication}" "$2" "WWW_OpenURL"
 
   ${FixShellIconHandler}
 
   ; The following keys should only be set if we can write to HKLM
   ${If} $TmpVal == "HKLM"
--- a/suite/installer/windows/nsis/shared.nsh
+++ b/suite/installer/windows/nsis/shared.nsh
@@ -319,17 +319,17 @@
   StrCpy $0 "SOFTWARE\Classes"
   StrCpy $1 "$\"$8$\" -requestPending -osint -url $\"%1$\""
   StrCpy $2 "$\"$8$\" -url $\"%1$\""
   StrCpy $3 "$\"%1$\",,0,0,,,,"
 
   ; An empty string is used for the 5th param because SeaMonkeyHTML is not a
   ; protocol handler
   ${AddHandlerValues} "$0\SeaMonkeyHTML" "$2" \
-                      "$INSTDIR\chrome\icons\default\html-file.ico" \
+                      "$INSTDIR\chrome\icons\default\html-file.ico,0" \
                       "${AppRegName} Document" "" ""
   ${AddDDEHandlerValues} "SeaMonkeyURL" "$1" "$8,0" "${AppRegName} URL" "true" \
                          "${DDEApplication}" "$3" "WWW_OpenURL"
 
   ; 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.
   ${AddDDEHandlerValues} "ftp" "$1" "$8,0" "" "" "${DDEApplication}" "$3" "WWW_OpenURL"
@@ -367,17 +367,17 @@
   ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
 
   StrCpy $0 "SOFTWARE\Classes"
   StrCpy $1 "$\"$8$\" $\"%1$\""
   StrCpy $2 "$\"$8$\" -osint -compose $\"%1$\""
 
   ; An empty string is used for the 5th param because SeaMonkeyEML is not a
   ; protocol handler
-  ${AddHandlerValues} "$0\SeaMonkeyEML"  "$1" "$INSTDIR\chrome\icons\default\misc-file.ico" "${AppRegNameMail} Document" "" ""
+  ${AddHandlerValues} "$0\SeaMonkeyEML"  "$1" "$INSTDIR\chrome\icons\default\misc-file.ico,0" "${AppRegNameMail} Document" "" ""
 
   ${AddHandlerValues} "$0\SeaMonkeyCOMPOSE" "$2" "$8,0" "${AppRegNameMail} URL" "true" ""
 
   ; An empty string is used for the 4th & 5th params because the following
   ; protocol handler already has a display name and additional keys required
   ; for a protocol handler.
   ${AddHandlerValues} "$0\mailto" "$2" "$8,0" "${AppRegNameMail} URL" "true" ""
 
@@ -461,17 +461,17 @@
   ; always reference the install referenced in the
   ; HKLM\Software\Classes\SeaMonkeyHTML registry key.
   ClearErrors
   ReadRegStr $2 HKLM "Software\Classes\SeaMonkeyHTML\ShellEx\IconHandler" ""
   ${Unless} ${Errors}
     ClearErrors
     ReadRegStr $3 HKLM "Software\Classes\CLSID\$2\Old Icon\SeaMonkeyHTML\DefaultIcon" ""
     ${Unless} ${Errors}
-      WriteRegStr HKLM "Software\Classes\CLSID\$2\Old Icon\SeaMonkeyHTML\DefaultIcon" "" "$INSTDIR\chrome\icons\default\html-file.ico"
+      WriteRegStr HKLM "Software\Classes\CLSID\$2\Old Icon\SeaMonkeyHTML\DefaultIcon" "" "$INSTDIR\chrome\icons\default\html-file.ico,0"
     ${EndUnless}
   ${EndUnless}
 !macroend
 !define FixShellIconHandler "!insertmacro FixShellIconHandler"
 
 ; XXXrstrong - there are several values that will be overwritten by and
 ; overwrite other installs of the same application.
 !macro SetClientsMail
@@ -685,17 +685,17 @@
 
   ; Only set the file and protocol handlers if the existing one under HKCR is
   ; for this install location.
   ${IsHandlerForInstallDir} "SeaMonkeyHTML" $R9
   ${If} "$R9" == "true"
     ; An empty string is used for the 5th param because SeaMonkeyHTML is not a
     ; protocol handler.
     ${AddHandlerValues} "$0\SeaMonkeyHTML" "$5" \
-                        "$INSTDIR\chrome\icons\default\html-file.ico" \
+                        "$INSTDIR\chrome\icons\default\html-file.ico,0" \
                         "${AppRegName} Document" "" ""
   ${EndIf}
 
   ${IsHandlerForInstallDir} "SeaMonkeyURL" $R9
   ${If} "$R9" == "true"
     ${AddDDEHandlerValues} "SeaMonkeyURL" "$3" "$8,0" "${AppRegName} URL" \
                            "true" "${DDEApplication}" "$4" "WWW_OpenURL"
   ${EndIf}
@@ -716,17 +716,17 @@
   ${If} "$R9" == "true"
     ${AddDDEHandlerValues} "https" "$3" "$8,0" "" "" "${DDEApplication}" \
                            "$4" "WWW_OpenURL"
   ${EndIf}
 
   ${IsHandlerForInstallDir} "SeaMonkeyEML" $R9
   ${If} "$R9" == "true"
     ${AddHandlerValues} "SOFTWARE\Classes\SeaMonkeyEML" "$2" \
-                        "$INSTDIR\chrome\icons\default\misc-file.ico" \
+                        "$INSTDIR\chrome\icons\default\misc-file.ico,0" \
                         "${AppRegNameMail} Document" "" ""
   ${EndIf}
 
   ${IsHandlerForInstallDir} "SeaMonkeyMAIL" $R9
   ${If} "$R9" == "true"
     ${AddHandlerValues} "SOFTWARE\Classes\SeaMonkeyMAIL" "$2" "$8,0" \
                         "${AppRegNameMail} URL" "true" ""
   ${EndIf}
@@ -825,17 +825,17 @@
 
   ; Always set the file and protocol handlers since they may specify a
   ; different path and the path is used by Vista when setting associations.
   ${AddHandlerValues} "$0\SeaMonkeyURL" "$1" "$8,0" "${AppRegName} URL" "true" "true"
 
   ; An empty string is used for the 5th param because SeaMonkeyHTML is not a
   ; protocol handler
   ${AddHandlerValues} "$0\SeaMonkeyHTML" "$2" \
-                      "$INSTDIR\chrome\icons\default\html-file.ico" \
+                      "$INSTDIR\chrome\icons\default\html-file.ico,0" \
                       "${AppRegName} Document" "" ""
 
   ReadRegStr $2 SHCTX "$0\http\shell\open\command" ""
   ClearErrors
   ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
   ${Unless} ${Errors}
     ${AddHandlerValues} "$0\http" "$1" "$8,0" "" "" "true"
   ${EndUnless}
@@ -865,17 +865,17 @@
   GetFullPathName $2 "$3"
   ClearErrors
   ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
   ${Unless} ${Errors}
    ${AddHandlerValues} "$0\mailto" "$1" "$8,0" "" "" ""
   ${EndUnless}
 
   StrCpy $1 "$\"$8$\" $\"%1$\""
-  ${AddHandlerValues} "$0\SeaMonkeyEML" "$1" "$INSTDIR\chrome\icons\default\misc-file.ico" "${AppRegNameMail} Document" "" ""
+  ${AddHandlerValues} "$0\SeaMonkeyEML" "$1" "$INSTDIR\chrome\icons\default\misc-file.ico,0" "${AppRegNameMail} Document" "" ""
 
   StrCpy $1 "$\"$8$\" -osint -mail $\"%1$\""
   ${AddHandlerValues} "$0\SeaMonkeyNEWS" "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
 
   ReadRegStr $2 SHCTX "$0\news\shell\open\command" ""
   ${GetPathFromString} "$2" $3
   GetFullPathName $2 "$3"
   ClearErrors