From 1d2c7d3bbaa60beee64fcf3b6834a2884f2da32d Mon Sep 17 00:00:00 2001
From: "kairo%kairo.at" <kairo%kairo.at@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 28 Jan 2008 18:54:04 +0000
Subject: [PATCH] bug 313822 - Make Lightning work on SeaMonkey, r=Mnyromyr
 sr=Neil

git-svn-id: svn://10.0.0.236/trunk@244227 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/base/resources/content/mailWindowOverlay.xul | 4 ++--
 mozilla/mailnews/base/resources/content/messageWindow.xul     | 2 +-
 mozilla/mailnews/base/resources/content/messenger.xul         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index ee9be0c1165..4ea26e0a9a2 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -1493,7 +1493,7 @@
     </template>
   </menu>
 
-  <menu label="&msgMenu.label;" accesskey="&msgMenu.accesskey;" >
+  <menu id="messageMenu" label="&msgMenu.label;" accesskey="&msgMenu.accesskey;">
     <menupopup id="messageMenuPopup" onpopupshowing="InitMessageMenu();">
       <menuitem id="newMsgCmd"
                 label="&newMsgCmd.label;"
@@ -1830,7 +1830,7 @@
 <spacer flex="100%"/>
 </menubar>
 
-<toolbox id="mailToolbarToolbox">
+<toolbox id="mail-toolbox">
   <toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed" grippytooltiptext="&mailToolbar.tooltip;">
       <toolbarbutton type="menu-button" id="button-getmsg"
                      class="toolbarbutton-1"
diff --git a/mozilla/mailnews/base/resources/content/messageWindow.xul b/mozilla/mailnews/base/resources/content/messageWindow.xul
index 0eb60eabf24..405f22af1c7 100644
--- a/mozilla/mailnews/base/resources/content/messageWindow.xul
+++ b/mozilla/mailnews/base/resources/content/messageWindow.xul
@@ -123,7 +123,7 @@
 
   <popup id="attachmentListContext"/>
 
-  <toolbox id="mailToolbarToolbox">
+  <toolbox id="mail-toolbox">
     <menubar id="mail-menubar"/>
   </toolbox>
 
diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul
index 07ec2bdf142..3d5039775d9 100644
--- a/mozilla/mailnews/base/resources/content/messenger.xul
+++ b/mozilla/mailnews/base/resources/content/messenger.xul
@@ -139,7 +139,7 @@
 
 <popup id="messagePaneContext"/>
 
-  <toolbox id="mailToolbarToolbox" class="toolbox-top">
+  <toolbox id="mail-toolbox" class="toolbox-top">
     <menubar id="mail-menubar"/>
     <toolbar id="msgToolbar"/>
     <toolbar id="msgLocationToolbar"/>