From c1624636afcc46d5b4aec2aba8374f7e5ca013fc Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Wed, 27 Dec 2006 23:51:11 +0000
Subject: [PATCH] Make some more help buttons work in suiterunner b=346605
 r=IanN

---
 suite/common/helpMessengerOverlay.xul | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/suite/common/helpMessengerOverlay.xul b/suite/common/helpMessengerOverlay.xul
index 0f5744172be..2030312a0b2 100644
--- a/suite/common/helpMessengerOverlay.xul
+++ b/suite/common/helpMessengerOverlay.xul
@@ -41,14 +41,17 @@
 
   <script type="application/x-javascript"
           src="chrome://help/content/contextHelp.js"/>
+  <script type="application/x-javascript">
+    setHelpFileURI('chrome://communicator/locale/help/suitehelp.rdf');
+  </script>
 
   <dialog id="editDirectories"
           buttons="accept,cancel,help"
-          ondialoghelp="return doHelpButton();"/>
+          ondialoghelp="return openHelp('mail-ldap-properties');"/>
 
   <dialog id="addDirectory"
           buttons="accept,cancel,help"
-          ondialoghelp="return doHelpButton();"/>
+          ondialoghelp="return openHelp('mail-ldap-properties');"/>
 
   <dialog id="accountManager"
           buttons="accept,cancel,help"
@@ -56,33 +59,33 @@
 
   <dialog id="FilterEditor"
           buttons="accept,cancel,help"
-          ondialoghelp="return doHelpButton();"/>
+          ondialoghelp="return openHelp('mail-filters');"/>
 
   <dialog id="junkMailInfo"
           buttons="accept,help"
-          ondialoghelp="return openHelp('mail-junk', 'chrome://communicator/locale/help/suitehelp.rdf');"/>
+          ondialoghelp="return openHelp('mail-junk');"/>
 
   <dialog id="select-offline"
           buttons="accept,cancel,help"
-          ondialoghelp="return doHelpButton();"/>
+          ondialoghelp="return openHelp('mail-offline-items');"/>
 
   <dialog id="subscribeWindow"
           buttons="accept,cancel,help"
-          ondialoghelp="return doHelpButton();"/>
+          ondialoghelp="return openHelp('mail-subscribe');"/>
 
   <dialog id="mailViewListDialog"
           buttons="accept,help"
-          ondialoghelp="return openHelp('message-views-using', 'chrome://communicator/locale/help/suitehelp.rdf');"/>
+          ondialoghelp="return openHelp('message-views-using');"/>
 
   <dialog id="mailViewSetupDialog"
           buttons="accept,cancel,help"
-          ondialoghelp="return doHelpButton();"/>
+          ondialoghelp="return openHelp('message-views-create-new');"/>
 
   <dialog id="msgCompSecurityInfo"
           buttons="accept,help"
-          ondialoghelp="return doHelpButton();"/>
+          ondialoghelp="return openHelp('compose_security');"/>
 
   <dialog id="msgReadSecurityInfo"
           buttons="accept,help"
-          ondialoghelp="return doHelpButton();"/>
+          ondialoghelp="return openHelp('received_security');"/>
 </overlay>