Win32 only - Bug 309496 - Firefox 1.0.7 clean install installs nsIQTScriptablePlugin.xpt to plugins folder. r=sspitzer

browser/installer/windows/nsis/installer.nsi

@@ -369,11 +369,8 @@ Section "-Application" Section1
   ${EndIf}
 
   ${LogHeader} "Adding Additional Files"
-  ; Only for Firefox and only if they don't already exist
+  ; Check if QuickTime is installed and copy the nsIQTScriptablePlugin.xpt from
-  ; Check if QuickTime is installed and copy the contents of its plugins
+  ; its plugins directory into the app's components directory.
-  ; directory into the app's plugins directory. Previously only the
-  ; nsIQTScriptablePlugin.xpt files was copied which is not enough to enable
-  ; QuickTime as a plugin.
   ClearErrors
   ReadRegStr $R0 HKLM "Software\Apple Computer, Inc.\QuickTime" "InstallDir"
   ${Unless} ${Errors}
@@ -381,12 +378,16 @@ Section "-Application" Section1
     ${GetPathFromRegStr}
     Pop $R0
     ${Unless} ${Errors}
-      GetFullPathName $R0 "$R0\Plugins"
+      GetFullPathName $R0 "$R0\Plugins\nsIQTScriptablePlugin.xpt"
       ${Unless} ${Errors}
-        ${LogHeader} "Copying QuickTime Plugin Files"
+        ${LogHeader} "Copying QuickTime Scriptable Component"
-        ${LogMsg} "Source Directory: $R0\Plugins"
+        CopyFiles /SILENT "$R0" "$INSTDIR\components"
-        StrCpy $R1 "$INSTDIR\plugins"
+        ${If} ${Errors}
-        Call DoCopyFiles
+          ${LogMsg} "** ERROR Installing File: $INSTDIR\components\nsIQTScriptablePlugin.xpt **"
+        ${Else}
+          ${LogMsg} "Installed File: $INSTDIR\components\nsIQTScriptablePlugin.xpt"
+          ${LogUninstall} "File: $R3"
+        ${EndIf}
       ${EndUnless}
     ${EndUnless}
   ${EndUnless}