From 07c2025baf9fcd3a06bb7438e4f87c811fe6a098 Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com"
 <mozilla.mano%sent.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 23 Mar 2007 00:00:34 +0000
Subject: [PATCH] Bug 371439 - Some old history & bookmarks frontend code is
 still built for places/places-bookmarks builds. r=gavin.

git-svn-id: svn://10.0.0.236/trunk@222218 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser-sets.inc      | 2 ++
 mozilla/browser/base/content/browser.xul           | 2 ++
 mozilla/browser/base/content/macBrowserOverlay.xul | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/mozilla/browser/base/content/browser-sets.inc b/mozilla/browser/base/content/browser-sets.inc
index afe8797b75b..4c5eb4602cf 100644
--- a/mozilla/browser/base/content/browser-sets.inc
+++ b/mozilla/browser/base/content/browser-sets.inc
@@ -52,6 +52,7 @@
 
   <commandset id="mainCommandSet">
     <command id="cmd_newNavigator"                 oncommand="OpenBrowserWindow()"/>
+#ifndef MOZ_PLACES_BOOKMARKS
     <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
     <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
     <command id="cmd_bm_openinnewtab"              oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
@@ -66,6 +67,7 @@
     <command id="cmd_bm_rename"                    oncommand="goDoCommand('cmd_bm_rename');"/>
     <command id="cmd_bm_moveBookmark"              oncommand="goDoCommand('cmd_bm_moveBookmark');"/>
     <command id="cmd_bm_sortbyname"                oncommand="goDoCommand('cmd_bm_sortbyname');"/>
+#endif
 
     <command id="cmd_handleBackspace" oncommand="BrowserHandleBackspace();" />
     <command id="cmd_handleShiftBackspace" oncommand="BrowserHandleShiftBackspace();" />
diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index fd7c624771d..9ff8f46e0c3 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -134,8 +134,10 @@
     <popup id="placesContext"/>
   </popupset>
 
+#ifndef MOZ_PLACES
 # The hacky hidden tree used by the Go menu to build items.
 #include browser-gotreehack.inc
+#endif
 
 #ifndef MOZ_PLACES_BOOKMARKS
   <!-- bookmarks context menu -->
diff --git a/mozilla/browser/base/content/macBrowserOverlay.xul b/mozilla/browser/base/content/macBrowserOverlay.xul
index f0259b7f62b..2ca3c1690af 100644
--- a/mozilla/browser/base/content/macBrowserOverlay.xul
+++ b/mozilla/browser/base/content/macBrowserOverlay.xul
@@ -72,8 +72,10 @@
 # browser-sets.inc file for sharing with hiddenWindow.xul.
 #include browser-sets.inc
 
+#ifndef MOZ_PLACES
 # The hacky hidden tree used by the Go menu to build items.
 #include browser-gotreehack.inc
+#endif
 
 # The entire main menubar is placed into browser-menubar.inc, so that it can be shared by 
 # hiddenWindow.xul.