From ec48a9bb93203d69c321696567ae31e9858545c8 Mon Sep 17 00:00:00 2001 From: "benjamin@smedbergs.us" Date: Mon, 2 Jul 2007 08:58:19 -0700 Subject: [PATCH] Bug 384174 - Remove the last vestiges of talkback, r=robstrong --- browser/installer/Makefile.in | 1 - browser/installer/removed-files.in | 20 ++++- browser/installer/unix/packages-static | 11 --- browser/installer/windows/nsis/installer.nsi | 90 +------------------- browser/installer/windows/packages-static | 16 ---- 5 files changed, 22 insertions(+), 116 deletions(-) diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index d47d018bc263..2c433cd68610 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -79,7 +79,6 @@ MOZ_LOCALIZED_PKG_LIST = $(AB_CD) MOZ_OPTIONAL_PKG_LIST = \ adt \ - talkback \ $(NULL) DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index 64e3e5617467..5004b205bce1 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -467,11 +467,21 @@ searchplugins/zoznam-sk.gif components/sidebar.xpt components/xmlextras.xpt components/xpcom.xpt -#ifdef XP_MACOSX +extensions/talkback@mozilla.org/ extensions/talkback@mozilla.org/install.rdf extensions/talkback@mozilla.org/chrome.manifest -extensions/talkback@mozilla.org/components/@DLL_PREFIX@qfaservices@DLL_SUFFIX@ extensions/talkback@mozilla.org/components/qfaservices.xpt +extensions/talkback@mozilla.org/components/@DLL_PREFIX@qfaservices@DLL_SUFFIX@ +#ifdef XP_WIN +extensions/talkback@mozilla.org/components/BrandRes.dll +extensions/talkback@mozilla.org/components/fullsoft.dll +extensions/talkback@mozilla.org/components/master.ini +extensions/talkback@mozilla.org/components/talkback-l10n.ini +extensions/talkback@mozilla.org/components/talkback.cnt +extensions/talkback@mozilla.org/components/talkback.exe +extensions/talkback@mozilla.org/components/talkback.hlp +#else +#ifdef XP_MACOSX extensions/talkback@mozilla.org/components/talkback/master.ini extensions/talkback@mozilla.org/components/talkback/talkback@DLL_SUFFIX@ extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Info.plist @@ -504,4 +514,10 @@ extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resour extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_ascending.tiff extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_descending.tiff extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/Talkback.icns +#else +extensions/talkback@mozilla.org/components/talkback/talkback +extensions/talkback@mozilla.org/components/talkback/XTalkback.ad +extensions/talkback@mozilla.org/components/master.ini +extensions/talkback@mozilla.org/components/talkback.so +#endif #endif diff --git a/browser/installer/unix/packages-static b/browser/installer/unix/packages-static index afa10052715e..4749da49c4b5 100644 --- a/browser/installer/unix/packages-static +++ b/browser/installer/unix/packages-static @@ -369,14 +369,3 @@ bin/extensions/inspector@mozilla.org/components/inspector-cmdline.js bin/extensions/inspector@mozilla.org/chrome.manifest bin/extensions/inspector@mozilla.org/chrome/inspector.jar bin/extensions/inspector@mozilla.org/defaults/preferences/inspector.js - -; [Additional Browsing Enhancements] -[abe] - -[talkback] -bin/README.txt,bin/readme.txt -bin/extensions/talkback@mozilla.org/install.rdf -bin/extensions/talkback@mozilla.org/chrome.manifest -bin/extensions/talkback@mozilla.org/components/libqfaservices.so -bin/extensions/talkback@mozilla.org/components/qfaservices.xpt -bin/extensions/talkback@mozilla.org/components/talkback/* diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi index dba97818210d..b2ce8064e5ea 100755 --- a/browser/installer/windows/nsis/installer.nsi +++ b/browser/installer/windows/nsis/installer.nsi @@ -251,23 +251,7 @@ Section "-Application" Section1 StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullNameInternal} (${AppVersion})" DeleteRegKey HKLM "$0" - ; For a "Standard" upgrade without talkback installed add the InstallDisabled - ; file to the talkback source files so it will be disabled by the extension - ; manager. This is done at the start of the installation since we check for - ; the existence of a directory to determine if this is an upgrade. - ${If} $InstallType == 1 - ${AndIf} ${FileExists} "$INSTDIR\greprefs" - ${AndIf} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org" - ${Unless} ${FileExists} "$INSTDIR\extensions\talkback@mozilla.org" - ${Unless} ${FileExists} "$INSTDIR\extensions" - CreateDirectory "$INSTDIR\extensions" - ${EndUnless} - CreateDirectory "$INSTDIR\extensions\talkback@mozilla.org" - FileOpen $2 "$EXEDIR\optional\extensions\talkback@mozilla.org\InstallDisabled" w - FileWrite $2 "$\r$\n" - FileClose $2 - ${EndUnless} - ${Else} + ${If} $InstallType != 1 ; Custom installs. ; If DOMi is installed and this install includes DOMi remove it from ; the installation directory. This will remove it if the user deselected @@ -276,13 +260,6 @@ Section "-Application" Section1 ${AndIf} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org" RmDir /r "$INSTDIR\extensions\inspector@mozilla.org" ${EndIf} - ; If TalkBack is installed and this install includes TalkBack remove it from - ; the installation directory. This will remove it if the user deselected - ; TalkBack on the components page. - ${If} ${FileExists} "$INSTDIR\extensions\talkback@mozilla.org" - ${AndIf} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org" - RmDir /r "$INSTDIR\extensions\talkback@mozilla.org" - ${EndIf} ${EndIf} Call CleanupOldLogs @@ -381,7 +358,6 @@ Section "-Application" Section1 Call DoCopyFiles ${If} $InstallType != 4 - Call installTalkback ${If} ${FileExists} "$INSTDIR\extensions\inspector@mozilla.org" Call installInspector ${EndIf} @@ -530,10 +506,6 @@ Section /o "Developer Tools" Section2 Call installInspector SectionEnd -Section /o "Quality Feedback Agent" Section3 - Call installTalkback -SectionEnd - ################################################################################ # Helper Functions @@ -551,43 +523,6 @@ Function installInspector ${EndIf} FunctionEnd -Function installTalkback - StrCpy $R0 "$EXEDIR\optional\extensions\talkback@mozilla.org" - ${If} ${FileExists} "$R0" - SetDetailsPrint textonly - DetailPrint $(STATUS_INSTALL_OPTIONAL) - SetDetailsPrint none - StrCpy $R1 "$INSTDIR\extensions\talkback@mozilla.org" - ${If} ${FileExists} "$R1" - ; If there is an existing InstallDisabled file copy it to the source dir. - ; This will add it during install to the uninstall.log and retains the - ; original disabled state from the installation. - ${If} ${FileExists} "$R1\InstallDisabled" - CopyFiles /SILENT "$R1\InstallDisabled" "$R0" - ${EndIf} - ; Remove the existing install of talkback - RmDir /r "$R1" - ${ElseIf} $InstallType == 1 - ; For standard installations only enable talkback for the x percent as - ; defined by the application. We use QueryPerformanceCounter for the seed - ; since it returns a 64bit integer which should improve the accuracy. - System::Call "kernel32::QueryPerformanceCounter(*l.r1)" - System::Int64Op $1 % 100 - Pop $0 - ; The percentage provided by the application refers to the percentage to - ; include so all numbers equal or greater than should be disabled. - ${If} $0 >= ${RandomPercent} - FileOpen $2 "$R0\InstallDisabled" w - FileWrite $2 "$\r$\n" - FileClose $2 - ${EndIf} - ${EndIf} - ClearErrors - ${LogHeader} "Installing Quality Feedback Agent" - Call DoCopyFiles - ${EndIf} -FunctionEnd - ; Copies a file to a temporary backup directory and then checks if it is in use ; by attempting to delete the file. If the file is in use an error is displayed ; and the user is given the options to either retry or cancel. If cancel is @@ -879,8 +814,6 @@ FunctionEnd Function leaveComponents ; If DOMi exists then it will be Field 2. - ; If DOMi doesn't exist and talkback exists then TalkBack will be Field 2 but - ; if DOMi doesn't exist we won't display this page anyways. StrCpy $R1 2 ${If} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org" ${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field $R1" "State" @@ -892,14 +825,7 @@ Function leaveComponents SectionSetFlags 1 0 ; Disable install for DOMi ${EndIf} - ${If} ${FileExists} "$EXEDIR\optional\extensions\talkback@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 2 $R0 - ${Else} - SectionSetFlags 2 0 ; Disable install for TalkBack - ${EndIf} + SectionSetFlags 2 0 ; Disable install of TalkBack FunctionEnd Function preDirectory @@ -1128,14 +1054,6 @@ Function .onInit SectionSetText 1 "" ${EndIf} - ; Set the section size for Talkback only if it exists. - ${If} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org" - ${GetSize} "$EXEDIR\optional\extensions\talkback@mozilla.org" "/S=0K" $0 $8 $9 - SectionSetSize 2 $0 - ; Install Talkback by default. - SectionSetFlags 2 1 - ${Else} - ; Hide Talkback in the components page if it isn't available. - SectionSetText 2 "" - ${EndIf} + ; Hide Talkback in the components page + SectionSetText 2 "" FunctionEnd diff --git a/browser/installer/windows/packages-static b/browser/installer/windows/packages-static index fc0fac514cb6..9887b0e7831e 100644 --- a/browser/installer/windows/packages-static +++ b/browser/installer/windows/packages-static @@ -350,19 +350,3 @@ bin\extensions\inspector@mozilla.org\chrome.manifest bin\extensions\inspector@mozilla.org\chrome\inspector.jar bin\extensions\inspector@mozilla.org\defaults\preferences\inspector.js bin\extensions\inspector@mozilla.org\chrome\icons\default\winInspectorMain.ico - -; [Additional Browsing Enhancements] -[abe] - -[talkback] -bin\extensions\talkback@mozilla.org\install.rdf -bin\extensions\talkback@mozilla.org\chrome.manifest -bin\extensions\talkback@mozilla.org\components\qfaservices.dll -bin\extensions\talkback@mozilla.org\components\qfaservices.xpt -bin\extensions\talkback@mozilla.org\components\BrandRes.dll -bin\extensions\talkback@mozilla.org\components\fullsoft.dll -bin\extensions\talkback@mozilla.org\components\master.ini -bin\extensions\talkback@mozilla.org\components\talkback-l10n.ini -bin\extensions\talkback@mozilla.org\components\talkback.cnt -bin\extensions\talkback@mozilla.org\components\talkback.exe -bin\extensions\talkback@mozilla.org\components\talkback.hlp