From 506f1666cfb6f4ed7ad35dae08617c256e031853 Mon Sep 17 00:00:00 2001
From: "racham%netscape.com" <racham%netscape.com>
Date: Wed, 31 Oct 2001 23:29:53 +0000
Subject: [PATCH] Fixing bug 107779. This is a regression. Make messagepane
 link context menu items to work by using the global context menu var.
 r=ssu,ben sr=sspitzer

---
 .../resources/content/mailWindowOverlay.xul   | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 3f6a71bdb76..55363ce1c5d 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -38,12 +38,6 @@ Rights Reserved.
   xmlns:nc="http://home.netscape.com/NC-rdf#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<!-- Context menu -->
-<script type="application/x-javascript">
-  // Global variable that holds the nsContextMenu instance.
-  var gMessagePaneContextMenu = null;
-</script>
-
 <script src="chrome://messenger/content/mailCommands.js"/>
 <script src="chrome://messenger/content/mailWindowOverlay.js"/>
 <script src="chrome://messenger/content/commandglue.js"/>
@@ -554,7 +548,7 @@ Rights Reserved.
         <menuitem id="context-openlink"
                   label="&openLinkCmd.label;"
                   accesskey="&openLinkCmd.accesskey;"
-                  oncommand="gMessagePaneContextMenu.openLink();"/>
+                  oncommand="gContextMenu.openLink();"/>
         <menuseparator id="messagePaneContext-sep-link"/>
         <menuitem id="context-selectall"
                   label="&selectAllCmd.label;"
@@ -741,7 +735,7 @@ Rights Reserved.
         <menuitem id="context-viewimage"
                   label="&viewImageCmd.label;"
                   accesskey="&viewImageCmd.accesskey;"
-                  oncommand="gMessagePaneContextMenu.viewImage();"/>
+                  oncommand="gContextMenu.viewImage();"/>
         <menuseparator id="messagePaneContext-sep-image"/>
         <menuitem id="context-copylink"
                   label="&copyLinkCmd.label;"
@@ -754,20 +748,20 @@ Rights Reserved.
         <menuitem id="context-copyemail"
                   label="&copyEmailCmd.label;"
                   accesskey="&copyEmailCmd.accesskey;"
-                  oncommand="gMessagePaneContextMenu.copyEmail();"/>
+                  oncommand="gContextMenu.copyEmail();"/>
         <menuseparator id="messagePaneContext-sep-copy"/>
         <menuitem id="context-savelink"
                   label="&saveLinkCmd.label;"
                   accesskey="&saveLinkCmd.accesskey;"
-                  oncommand="gMessagePaneContextMenu.saveLink();"/>
+                  oncommand="gContextMenu.saveLink();"/>
         <menuitem id="context-saveimage"
                   accesskey="&saveImageCmd.accesskey;"
-                  oncommand="gMessagePaneContextMenu.saveImage();"/>
+                  oncommand="gContextMenu.saveImage();"/>
         <menuitem id="context-bookmarklink"
                   label="&bookmarkLinkCmd.label;"
                   accesskey="&bookmarkLinkCmd.accesskey;"
-                  oncommand="BookmarksUtils.addBookmark(gMessagePaneContextMenu.linkURL(),
-                                                        gMessagePaneContextMenu.linkText());"/>
+                  oncommand="BookmarksUtils.addBookmark(gContextMenu.linkURL(),
+                                                        gContextMenu.linkText());"/>
 
 </popup>