From 974ab0565abf551dfca9f90f90074308e600a187 Mon Sep 17 00:00:00 2001
From: "joshmoz%gmail.com"
 <joshmoz%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 28 Mar 2007 05:10:53 +0000
Subject: [PATCH] Followup for bug 369767. Remove old workaround for the bug in
 our menu overlay, hide about menu item separator like we do for prefs and
 quit. b=369767 r=mano

git-svn-id: svn://10.0.0.236/trunk@222525 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/baseMenuOverlay.xul | 9 ++-------
 mozilla/widget/src/cocoa/nsMenuBarX.mm           | 3 ++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/mozilla/browser/base/content/baseMenuOverlay.xul b/mozilla/browser/base/content/baseMenuOverlay.xul
index 23ac1f93d61..ba70ca7ddf5 100644
--- a/mozilla/browser/base/content/baseMenuOverlay.xul
+++ b/mozilla/browser/base/content/baseMenuOverlay.xul
@@ -97,21 +97,16 @@
                   label="&helpReleaseNotes.label;"
                   oncommand="openReleaseNotes(event)"
                   onclick="checkForMiddleClick(this, event);"/>
-        <menuseparator id="aboutSeparator"/>
+        <menuseparator/>
         <menuitem id="checkForUpdates"
                   accesskey="&updateCmd.accesskey;"
                   label="&updateCmd.label;"
                   class="menuitem-iconic"
                   oncommand="checkForUpdates();"/>
-#ifndef XP_MACOSX
-        <menuseparator/>
-#endif
+        <menuseparator id="aboutSeparator"/>
         <menuitem id="aboutName"
                   accesskey="&aboutCmd.accesskey;"
                   label="&aboutCmd.label;"
-#ifdef XP_MACOSX
-                  hidden="true"
-#endif
                   oncommand="openAboutDialog();"/>
       </menupopup>
     </menu>
diff --git a/mozilla/widget/src/cocoa/nsMenuBarX.mm b/mozilla/widget/src/cocoa/nsMenuBarX.mm
index 4439e49b7ed..484d0d8d19e 100644
--- a/mozilla/widget/src/cocoa/nsMenuBarX.mm
+++ b/mozilla/widget/src/cocoa/nsMenuBarX.mm
@@ -253,7 +253,8 @@ nsMenuBarX::AquifyMenuBar()
 {
   nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(mMenuBarContent->GetDocument()));
   if (domDoc) {
-    // remove the "About..." menu item
+    // remove the "About..." item and its separator
+    HideItem(domDoc, NS_LITERAL_STRING("aboutSeparator"), nsnull);
     HideItem(domDoc, NS_LITERAL_STRING("aboutName"), getter_AddRefs(mAboutItemContent));
     if (!sAboutItemContent)
       sAboutItemContent = mAboutItemContent;