From 4c0198b5a1005ed2f22a9f3bfb69c59ffd297ee1 Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 27 Jul 2006 14:57:46 +0000
Subject: [PATCH] Bug 230349       Adding multiple history entries to bookmarks
 fails and context menu reads       "Bookmark this Page(L)" patch by
 durbacher@gmx.de (Andreas Kunz) r=neil.parkwaycc.co.uk sr=alecf

git-svn-id: svn://10.0.0.236/trunk@204847 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/common/history/history.js                | 10 ++++++++--
 .../en-US/chrome/common/history/historyTreeOverlay.dtd |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mozilla/suite/common/history/history.js b/mozilla/suite/common/history/history.js
index d6a53d76e82..6a92a5b47c9 100644
--- a/mozilla/suite/common/history/history.js
+++ b/mozilla/suite/common/history/history.js
@@ -392,18 +392,22 @@ function historyAddBookmarks()
     var currentIndex = gHistoryTree.currentIndex;
     url = gHistoryTree.treeBoxObject.view.getCellText(currentIndex, "URL");
     title = gHistoryTree.treeBoxObject.view.getCellText(currentIndex, "Name");
-    BookmarksUtils.addBookmark(url, title, undefined, true);
+    BookmarksUtils.addBookmark(url, title, null, true);
   }
   else if (count > 1) {
     var min = new Object(); 
     var max = new Object();
     var rangeCount = gHistoryTree.treeBoxObject.view.selection.getRangeCount();
+    if (!BMSVC) {
+      initServices();
+      initBMService();
+    }
     for (var i = 0; i < rangeCount; ++i) {
       gHistoryTree.treeBoxObject.view.selection.getRangeAt(i, min, max);
       for (var k = max.value; k >= min.value; --k) {
         url = gHistoryTree.treeBoxObject.view.getCellText(k, "URL");
         title = gHistoryTree.treeBoxObject.view.getCellText(k, "Name");
-        BookmarksUtils.addBookmark(url, title, undefined, false);
+        BookmarksUtils.addBookmark(url, title, null, false);
       }
     }
   }
@@ -453,6 +457,7 @@ function updateItems()
       sep1.hidden = false;
       sep2.hidden = false;
       bookmarkItem.setAttribute("label", document.getElementById('multipleBookmarks').getAttribute("label"));
+      bookmarkItem.setAttribute("accesskey", document.getElementById('multipleBookmarks').getAttribute("accesskey"));
       openItem.removeAttribute("default");
       openItemInNewWindow.setAttribute("default", "true");
       openItemInNewWindow.hidden = false;
@@ -462,6 +467,7 @@ function updateItems()
   else {
     openItemInNewWindow.hidden = false;
     bookmarkItem.setAttribute("label", document.getElementById('oneBookmark').getAttribute("label"));
+    bookmarkItem.setAttribute("accesskey", document.getElementById('oneBookmark').getAttribute("accesskey"));
     sep2.hidden = false;
     var currentIndex = gHistoryTree.currentIndex;
     if (isContainer(gHistoryTree, currentIndex)) {   // one folder selected
diff --git a/mozilla/suite/locales/en-US/chrome/common/history/historyTreeOverlay.dtd b/mozilla/suite/locales/en-US/chrome/common/history/historyTreeOverlay.dtd
index 534951d011c..9285bf99af3 100644
--- a/mozilla/suite/locales/en-US/chrome/common/history/historyTreeOverlay.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/history/historyTreeOverlay.dtd
@@ -12,3 +12,5 @@
 <!ENTITY tree.header.hostname.akey           "H">
 <!ENTITY tree.header.visitcount.label        "Visit Count">
 <!ENTITY tree.header.visitcount.akey         "V">
+<!ENTITY bookmarkLinksCmd.label              "Bookmark These Links">
+<!ENTITY bookmarkLinksCmd.akey               "L">