[or-cvs] [torbutton/master 26/31] Move the context menu.

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Mon, 3 Jan 2011 16:53:13 -0600
Subject: Move the context menu.
Commit: 745a57ed69ed4052c89ed6c4d7846142fdd39f1b

FF4 disables the addon-bar, which somehow propagates immutable invisibility
status to the context menu there, so we move it to the nav-bar instead.  That
was a fun one to diagnose.
---
 src/chrome/content/torbutton.xul |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul
index 278225c..428d4da 100644
--- a/src/chrome/content/torbutton.xul
+++ b/src/chrome/content/torbutton.xul
@@ -17,6 +17,12 @@
         <stringbundle id="torbutton-bundle" src="chrome://torbutton/locale/torbutton.properties"/>
     </stringbundleset>
 
+    <!-- Place the context menu in the nav bar, so that the lack
+         of the status bar on FF4 doesn't make it invisible -->
+    <toolbar id="nav-bar">
+        <popup id="torbutton-context-menu"/>
+    </toolbar>
+
     <toolbarpalette id="BrowserToolbarPalette">
         <toolbarbutton 
             id="torbutton-button"
@@ -40,8 +46,6 @@
             insertbefore="statusbar-updates"
                         context="torbutton-context-menu"
             onclick="if (event.button == 0) torbutton_toggle(false)"/>
-
-        <popup id="torbutton-context-menu"/>
 <!--        <statusbarpanel context="clipmenu" class="statusbarpanel-iconic" id="plugins-status" tooltip="plugin-tooltip" onclick="torbutton_toggle_plugins();"/> -->
    </statusbar>
    <popup id="contentAreaContextMenu">
-- 
1.7.1