commit 53f1a2cf0315ccd48f326227c20e51e136667558 Author: Kathy Brade brade@pearlcrescent.com Date: Mon May 11 11:05:15 2015 -0400

Bug 15984: disabling Torbutton breaks the Add-ons manager

Overlay the about:addons page to avoid a direct dependency on entities that are defined in Torbutton. --- src/chrome.manifest | 2 ++ src/chrome/content/torbutton-extensions.xul | 28 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+)

diff --git a/src/chrome.manifest b/src/chrome.manifest index 6ef50dc..4dc08da 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -3,6 +3,8 @@ overlay chrome://browser/content/browser.xul chrome://torbutton/content/torbutto overlay chrome://browser/content/preferences/connection.xul chrome://torbutton/content/pref-connection.xul overlay chrome://messenger/content/messenger.xul chrome://torbutton/content/torbutton_tb.xul overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://torbutton/content/torbutton_tb.xul +overlay about:addons chrome://torbutton/content/torbutton-extensions.xul +overlay chrome://mozapps/content/extensions/extensions.xul chrome://torbutton/content/torbutton-extensions.xul resource torbutton ./

# browser branding diff --git a/src/chrome/content/torbutton-extensions.xul b/src/chrome/content/torbutton-extensions.xul new file mode 100644 index 0000000..060594d --- /dev/null +++ b/src/chrome/content/torbutton-extensions.xul @@ -0,0 +1,28 @@ +<?xml version="1.0"?> + +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/brand.dtd"> + +<overlay id="torbutton-extensions-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul%22%3E + + <vbox id="plugin-enable-button" class="alert-container" flex="1" + hidden="true"> + <spacer class="alert-spacer-before"/> + <vbox class="alert"> + <label value="&plugins.installed.find;"/> + <button class="button-plugin-enable" + label="&plugins.installed.enable;" + command="cmd_pluginEnable"/> + </vbox> + <spacer class="alert-spacer-after"/> + </vbox> + + <vbox id="plugin-disable-button" class="global-info" flex="1" align="end"> + <button class="button-plugin-disable" + label="&plugins.installed.disable;" + tooltiptext="&plugins.installed.disable.tip;" + command="cmd_pluginDisable"/> + <spacer flex="5000"/> + </vbox> + +</overlay>