From affd27e5a30122cc50cb15227e3365e079b015dc Mon Sep 17 00:00:00 2001
From: "brendan%mozilla.org"
 <brendan%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 29 Jul 2006 05:44:10 +0000
Subject: [PATCH] Fixes and cleanups required by the infrastructure patch for
 281988, r+sr=bsmedberg+bz.

git-svn-id: svn://10.0.0.236/trunk@205854 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/common/contentAreaContextOverlay.xul | 1 -
 mozilla/suite/common/nsContextMenu.js              | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mozilla/suite/common/contentAreaContextOverlay.xul b/mozilla/suite/common/contentAreaContextOverlay.xul
index 521f7abef24..9a24f705aed 100644
--- a/mozilla/suite/common/contentAreaContextOverlay.xul
+++ b/mozilla/suite/common/contentAreaContextOverlay.xul
@@ -52,7 +52,6 @@
   </script>
   <script type="application/x-javascript" src="chrome://communicator/content/nsContextMenu.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
 
   <popupset id="contentAreaContextSet">
     <!-- This is a generic context menu for a content area. It contains 
diff --git a/mozilla/suite/common/nsContextMenu.js b/mozilla/suite/common/nsContextMenu.js
index 849663acf74..f90b7cff398 100644
--- a/mozilla/suite/common/nsContextMenu.js
+++ b/mozilla/suite/common/nsContextMenu.js
@@ -559,7 +559,7 @@ nsContextMenu.prototype = {
         // when there is one
         var reference = null;
         if (context == "selection")
-          reference = focusedWindow.__proto__.getSelection.call(focusedWindow);
+          reference = focusedWindow.getSelection();
         else if (context == "mathml")
           reference = this.target;
         else
@@ -805,7 +805,7 @@ nsContextMenu.prototype = {
     
     searchSelected : function( charlen ) {
         var focusedWindow = document.commandDispatcher.focusedWindow;
-        var searchStr = focusedWindow.__proto__.getSelection.call(focusedWindow);
+        var searchStr = focusedWindow.getSelection();
         searchStr = searchStr.toString();
         // searching for more than 150 chars makes no sense
         if (!charlen)