commit 877818a6f4babe471c939ac1bccc821b16f0f5fe Author: Mike Perry mikeperry-git@fscked.org Date: Sat Mar 2 11:33:54 2013 -0800

Bug 8313: Move plugin disabling before our observer.

Might as well have everything in a clean state before we even register the plugin observer. --- src/chrome/content/torbutton.js | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 29baa0c..2b94378 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1999,6 +1999,10 @@ function torbutton_do_main_window_startup() function torbutton_do_startup() { if(m_tb_prefs.getBoolPref("extensions.torbutton.startup")) { + // Bug 1506: Still want to do this + torbutton_toggle_plugins( + m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins")); + // Bug 1506: Should probably be moved to an XPCOM component torbutton_do_main_window_startup();

@@ -2008,10 +2012,6 @@ function torbutton_do_startup() // For charsets torbutton_update_fingerprinting_prefs();

- // Bug 1506: Still want to do this - torbutton_toggle_plugins( - m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins")); - // #5758: Last ditch effort to keep Vanilla Torbutton users from totally // being pwnt. This is a pretty darn ugly hack, too. But because of #5863, // we really don't care about preserving the user's values for this.