[tor-commits] [torbutton/master] Fix a transparent context menu issue on Linux FF4+.

[mikeperry at torproject.org]

commit 505f51d2158720509428c1b24686723c49beb0f7
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Fri Jun 24 16:12:59 2011 -0700

    Fix a transparent context menu issue on Linux FF4+.
---
 src/chrome/content/popup.xul        |    4 ++--
 src/chrome/content/torbutton.xul    |    2 +-
 src/chrome/content/torbutton_tb.xul |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul
index 03f55f8..f96b821 100644
--- a/src/chrome/content/popup.xul
+++ b/src/chrome/content/popup.xul
@@ -9,7 +9,7 @@
     <stringbundleset id="torbutton-stringbundleset">
         <stringbundle id="torbutton-bundle" src="chrome://torbutton/locale/torbutton.properties"/>
     </stringbundleset>
-    <popup id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();">
+    <menupopup id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();">
         <menuitem id="torbutton-toggle"
                   label="&torbutton.context_menu.toggle;"
                   accesskey="&torbutton.context_menu.toggle.key;"
@@ -31,6 +31,6 @@
                   accesskey="&torbutton.context_menu.about.key;"
                   insertafter="context-stop"
                   oncommand="torbutton_open_about_dialog()"/>
-    </popup>
+    </menupopup>
 
 </overlay>
diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul
index 428d4da..f600f89 100644
--- a/src/chrome/content/torbutton.xul
+++ b/src/chrome/content/torbutton.xul
@@ -20,7 +20,7 @@
     <!-- 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"/>
+        <menupopup id="torbutton-context-menu"/>
     </toolbar>
 
     <toolbarpalette id="BrowserToolbarPalette">
diff --git a/src/chrome/content/torbutton_tb.xul b/src/chrome/content/torbutton_tb.xul
index 41f2d58..5142b2e 100644
--- a/src/chrome/content/torbutton_tb.xul
+++ b/src/chrome/content/torbutton_tb.xul
@@ -52,6 +52,6 @@
                         context="torbutton-context-menu"
             onclick="if (event.button == 0) torbutton_toggle(false)"/>
 
-        <popup id="torbutton-context-menu"/>
+        <menupopup id="torbutton-context-menu"/>
    </statusbar>
 </overlay>