From 5ea4c12c194ae5e3a7767bc7982707638e894d2b Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com" <rob_strong%exchangecode.com>
Date: Tue, 24 Jul 2007 20:22:58 +0000
Subject: [PATCH] Bug 388932 - Additional cleanup for talkback removal.
 r=bsmedberg

---
 browser/installer/windows/nsis/installer.nsi | 20 ++++----------------
 browser/installer/windows/nsis/shared.nsh    |  5 +++++
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
index 3dba7834a30..24a1b1d4ed1 100755
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -820,19 +820,10 @@ Function preComponents
 FunctionEnd
 
 Function leaveComponents
-  ; If DOMi exists then it will be Field 2.
-  StrCpy $R1 2
-  ${If} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org"
-    ${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field $R1" "State"
-    ; State will be 1 for checked and 0 for unchecked so we can use that to set
-    ; the section flags for installation.
-    SectionSetFlags 1 $R0
-    IntOp $R1 $R1 + 1
-  ${Else}
-    SectionSetFlags 1 0 ; Disable install for DOMi
-  ${EndIf}
-
-  SectionSetFlags 2 0 ; Disable install of TalkBack
+  ${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field 2" "State"
+  ; State will be 1 for checked and 0 for unchecked so we can use that to set
+  ; the section flags for installation.
+  SectionSetFlags 1 $R0
 FunctionEnd
 
 Function preDirectory
@@ -1071,7 +1062,4 @@ Function .onInit
     ; Hide DOMi in the components page if it isn't available.
     SectionSetText 1 ""
   ${EndIf}
-
-  ; Hide Talkback in the components page
-  SectionSetText 2 ""
 FunctionEnd
diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh
index 04621bb225f..d450f664fef 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -58,6 +58,11 @@
   ; Remove files that may be left behind by the application in the
   ; VirtualStore directory.
   ${CleanVirtualStore}
+
+  ; Remove talkback if it is present (remove after bug 386760 is fixed)
+  ${If} ${FileExists} "$INSTDIR\extensions\talkback@mozilla.org\"
+    RmDir /r "$INSTDIR\extensions\talkback@mozilla.org\"
+  ${EndIf}
 !macroend
 !define PostUpdate "!insertmacro PostUpdate"