commit b426228c016a443cc5b2cc29b30f84efc4346ab1 Author: Georg Koppen <gk@torproject.org> Date: Tue Dec 2 14:43:36 2014 +0000 Revert "Bug 13751: Get rid of remaining SafeCache parts." This reverts commit e2cce93493a857b062af83f5e8f9130fb76933a0. --- src/CHANGELOG | 3 --- src/chrome/content/torbutton.js | 6 ++++++ src/install.rdf | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 1966ab7..4510b0c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,6 +1,3 @@ -1.8.1.1 - * Bug 13751: Get rid of remaining SafeCache parts - 1.8.1.0 * Bug 13746: Properly link Torbutton UI to thirdparty pref. * Bug 13742: Remove SafeCache code (in favor of C++ implementation) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8dba1fd..da39864 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2690,6 +2690,9 @@ function torbutton_do_main_window_startup() torbutton_unique_pref_observer.register(); + // Bug 1506: This is probably the most important observer in this function + // XXX: We should fold this into our code/move it to its own component + SSC_startup(); } // Bug 1506 P4: Most of this function is now useless, save @@ -2955,6 +2958,9 @@ function torbutton_close_window(event) { progress.removeProgressListener(torbutton_weblistener); torbutton_unique_pref_observer.unregister(); + // XXX: We should fold this into our code.. + SSC_controller.removeListener(); + if(m_tb_is_main_window) { // main window not reset above // This happens on Mac OS because they allow firefox // to still persist without a navigator window diff --git a/src/install.rdf b/src/install.rdf index b39f0de..402b99c 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton@torproject.org</em:id> - <em:version>1.8.1.1</em:version> + <em:version>1.8.1.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>