From 75019b019561ec37839b8d87756459b36a3f8a42 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org"
 <scott%scott-macgregor.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 3 Jun 2003 04:40:09 +0000
Subject: [PATCH] Add the ability to drop toolbar icons into the menubar since
 a lot of people want to be able to do this (I had intentionally removed this
 functionality). Fix a JS error after customizing toolbars that was disabling
 menu items.

git-svn-id: svn://10.0.0.236/trunk@143227 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mail/base/content/mailWindowOverlay.xul              | 3 ++-
 mozilla/mail/components/addrbook/content/addressbook.xul     | 2 +-
 mozilla/mail/components/compose/content/messengercompose.xul | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index 17d074e5ff1..48a5bd70210 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -967,7 +967,7 @@ Rights Reserved.
 
 <toolbox id="mail-toolbox" class="toolbox-top" mode="icons">  
   <!-- Menu -->
-  <toolbar type="menubar" id="mail-toolbar-menubar" class="chromeclass-menubar" customizable="false" defaultset="menubar-items" mode="icons">
+  <toolbar type="menubar" id="mail-toolbar-menubar" class="chromeclass-menubar" customizable="true" defaultset="menubar-items" mode="icons">
     <toolbaritem id="menubar-items" align="center">
       <menubar id="mail-menubar" style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
         <!-- File -->
@@ -1623,6 +1623,7 @@ Rights Reserved.
            context="toolbar-context-menu"
            defaultset="button-getmsg,button-newmsg,button-address,spacer,spacer,spacer,button-reply,button-replyall,button-forward,spacer,spacer,spacer,button-delete,button-junk,button-print,button-stop,spring,throbber-box">
   </toolbar>
+  <toolbarset id="customToolbars" context="toolbar-context-menu"/>
 </toolbox>
 
 <hbox id="searchBox" persist="collapsed" align="center">
diff --git a/mozilla/mail/components/addrbook/content/addressbook.xul b/mozilla/mail/components/addrbook/content/addressbook.xul
index c4a26979644..c467faf5485 100644
--- a/mozilla/mail/components/addrbook/content/addressbook.xul
+++ b/mozilla/mail/components/addrbook/content/addressbook.xul
@@ -146,7 +146,7 @@ Contributor(s):
 </popupset>
 
 <toolbox id="ab-toolbox" class="toolbox-top" mode="icons">
-  <toolbar type="menubar" id="addrbook-toolbar-menubar" class="chromeclass-menubar" customizable="false"
+  <toolbar type="menubar" id="addrbook-toolbar-menubar" class="chromeclass-menubar" customizable="true"
      defaultset="menubar-items" mode="icons">
 
    <toolbaritem id="menubar-items" align="center">
diff --git a/mozilla/mail/components/compose/content/messengercompose.xul b/mozilla/mail/components/compose/content/messengercompose.xul
index 7c12b309023..0d4b9ba4290 100644
--- a/mozilla/mail/components/compose/content/messengercompose.xul
+++ b/mozilla/mail/components/compose/content/messengercompose.xul
@@ -216,7 +216,7 @@
   <toolbox id="compose-toolbox" class="toolbox-top" mode="icons"> 
   <!-- Menu -->
   
-  <toolbar type="menubar" id="msgcompose-toolbar-menubar" class="chromeclass-menubar" customizable="false"
+  <toolbar type="menubar" id="msgcompose-toolbar-menubar" class="chromeclass-menubar" customizable="true"
      defaultset="menubar-items" mode="full">
 
      <toolbaritem id="menubar-items" align="center">