From c581b7a67f1254113bb5b63842c803a0d2673629 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org"
 <timeless%mozdev.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 11 Dec 2002 14:10:13 +0000
Subject: [PATCH] Bug 130600 Search includes MailWindowOverlay which includes
 viewZoomOverlay which throws an exception. patch by neil@parkwaycc.co.uk
 r=jag sr=bienvenu

git-svn-id: svn://10.0.0.236/trunk@135127 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../base/search/resources/content/SearchDialog.xul | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
index 6ac9da5d689..30e04550842 100644
--- a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
@@ -25,7 +25,6 @@ Rights Reserved.
 <?xul-overlay href="chrome://messenger/content/threadPane.xul"?>
 <?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
-<?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/SearchDialog.dtd" >
@@ -68,6 +67,10 @@ Rights Reserved.
     </commandset>
   </commands>
 
+  <broadcasterset id="mailBroadcasters">
+    <broadcaster id="Communicator:WorkMode"/>
+  </broadcasterset>
+
   <dummy class="usesMailWidgets"/>
     
     <vbox flex="1">
@@ -185,5 +188,12 @@ Rights Reserved.
     </hbox>      
   </vbox>
 
-  <statusbar class="chromeclass-status" id="status-bar"/>
+  <statusbar class="chromeclass-status" id="status-bar"> 
+    <statusbarpanel class="statusbarpanel-iconic" id="offline-status"/>
+    <statusbarpanel class="statusbarpanel-progress">
+      <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0" oncommand="dumpProgress()"/>
+    </statusbarpanel>
+    <statusbarpanel id="statusText" crop="right" flex="1"/>
+  </statusbar> 
+
 </window>