From 6320a7dec7dc23187b3f0353dad9023ffa75d90c Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com"
 <sspitzer%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 19 Mar 2001 22:15:38 +0000
Subject: [PATCH] fix for #72371.  sr=bienvenu.  get "unsubscribe" working from
 the edit menu and the folder pane context menu.

git-svn-id: svn://10.0.0.236/trunk@89818 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../mailnews/base/resources/content/mailWindowOverlay.js   | 7 ++++---
 .../mailnews/base/resources/content/mailWindowOverlay.xul  | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
index ce0eef2e136..448236ca480 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
@@ -623,8 +623,10 @@ function MsgSubscribe()
 
 function ConfirmUnsubscribe(folder)
 {
-    var sBundle = srGetStrBundle("chrome://messenger/locale/messenger.properties"); 
-    var titleMsg = gMessengerBundle.GetStringFromName("confirmUnsubscribeTitle");
+    if (!gMessengerBundle)
+        gMessengerBundle = document.getElementById("bundle_messenger");
+
+    var titleMsg = gMessengerBundle.getString("confirmUnsubscribeTitle");
     var dialogMsg = gMessengerBundle.getFormattedString("confirmUnsubscribeText",
                                         [folder.name], 1);
 
@@ -682,7 +684,6 @@ function MsgOpenSelectedMessages()
 {
   var dbView = GetDBView();
 
-  dump("XXX dbView " + dbView + "\n");
   var indices = GetSelectedIndices(dbView);
   var numMessages = indices.length;
 
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 36caf2d4131..08aabc6a192 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -43,7 +43,9 @@ Rights Reserved.
 <script src="chrome://messenger/content/mailWindowOverlay.js"/>
 <script src="chrome://messenger/content/commandglue.js"/>
 
-<stringbundleset id="stringbundleset"/>
+<stringbundleset id="stringbundleset">
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+</stringbundleset>
 
 <commandset id="mailFileMenuItems"
      				commandupdater="true"