commit e495cc8de58c18f3d17b83d068689d40c65bd807 Author: Mike Perry <mikeperry-git@fscked.org> Date: Tue Sep 6 20:56:50 2011 -0700 Bug #3933: Don't touch app.update.auto in TBB TBB must not autoupdate via Mozilla. Regression was caused by the initial toggle fix in #2338. --- src/chrome/content/torbutton.js | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5378467..b6f7f3b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1655,10 +1655,13 @@ function torbutton_update_status(mode, force_update) { } else { torbutton_setBoolPref("extensions.update.enabled", "extension_update", true, mode, changed); - torbutton_setBoolPref("app.update.enabled", "app_update", + // In TBB, do not touch these two. They must remain off. + if (!m_tb_tbb) { + torbutton_setBoolPref("app.update.enabled", "app_update", true, mode, changed); - torbutton_setBoolPref("app.update.auto", "auto_update", + torbutton_setBoolPref("app.update.auto", "auto_update", true, mode, changed); + } torbutton_setBoolPref("browser.search.update", "search_update", true, mode, changed); }