commit 2f614ed514155e5473499c027054de8aea77e726 Author: Kathy Brade brade@pearlcrescent.com Date: Mon May 11 11:16:12 2015 -0400

fixup! Bug 10280: Don't load any plugins into the address space.

Overlay the about:addons page to avoid a direct dependency on entities that are defined in Torbutton. Fixes bug 15984. --- toolkit/mozapps/extensions/content/extensions.xul | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul index b64937b..4eb01bf 100644 --- a/toolkit/mozapps/extensions/content/extensions.xul +++ b/toolkit/mozapps/extensions/content/extensions.xul @@ -359,14 +359,7 @@ command="cmd_pluginCheck"/> <spacer flex="5000"/> <!-- Necessary to allow the message to wrap --> </hbox> - <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> + <vbox id="plugin-disable-button" /> <!-- Overlaid by Torbutton --> </hbox> <hbox class="view-header global-info-container experiment-info-container"> <hbox class="global-info" flex="1" align="center"> @@ -396,17 +389,7 @@ </vbox> <spacer class="alert-spacer-after"/> </vbox> - <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-enable-button" /> <!-- Overlaid by Torbutton --> <richlistbox id="addon-list" class="list" flex="1"/> </vbox>