merge backout

This commit is contained in:
Dão Gottwald 2010-07-28 10:19:49 +02:00
commit 5d581dc2e9

View File

@ -7766,11 +7766,13 @@ var TabContextMenu = {
menuItems[i].disabled = disabled;
// Session store
document.getElementById("context_undoCloseTab").disabled =
// XXXzeniko should't we just disable this item as we disable
// the tabbrowser-multiple items above - for consistency?
document.getElementById("context_undoCloseTab").hidden =
Cc["@mozilla.org/browser/sessionstore;1"].
getService(Ci.nsISessionStore).
getClosedTabCount(window) == 0;
// Only one of pin/unpin should be visible
document.getElementById("context_pinTab").hidden = this.contextTab.pinned;
document.getElementById("context_unpinTab").hidden = !this.contextTab.pinned;