From d6adfdc26f14796d058ca843633e4032fb5fbb3d Mon Sep 17 00:00:00 2001
From: "dmose%netscape.com" <dmose%netscape.com>
Date: Thu, 10 Oct 2002 19:30:49 +0000
Subject: [PATCH] Ongoing work for spam filtering GUI (bug 169638); not yet
 turned on in default builds.  Fix Junk Mail dialog to always show content,
 not just the initial time it comes up. r/sr=sspitzer@netscape.com;
 a=asa@mozilla.org

---
 mailnews/base/resources/content/junkMail.js  |  9 +++++++++
 mailnews/base/resources/content/junkMail.xul | 11 ++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/mailnews/base/resources/content/junkMail.js b/mailnews/base/resources/content/junkMail.js
index 9abbee175749..92fab12bd215 100644
--- a/mailnews/base/resources/content/junkMail.js
+++ b/mailnews/base/resources/content/junkMail.js
@@ -8,6 +8,8 @@ function onJunkMailLoad()
     // XXX todo, what if no folder?
     setupForAccountFromFolder(window.arguments[0].folder.URI);
   }
+
+  doSetOKCancel(onAccept, onCancel, doHelpButton);
 }
 
 function onServerClick(event)
@@ -175,4 +177,11 @@ function conditionallyEnableUI(id)
 function doHelpButton()
 {
   // implement help
+
+  return false; // don't close the top-level window
+}
+
+function onCancel()
+{
+  return true; // close the top-level window
 }
diff --git a/mailnews/base/resources/content/junkMail.xul b/mailnews/base/resources/content/junkMail.xul
index 4304b9d76916..4031cb17fafb 100644
--- a/mailnews/base/resources/content/junkMail.xul
+++ b/mailnews/base/resources/content/junkMail.xul
@@ -8,16 +8,13 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/junkMail.dtd">
 
-<dialog id="junkMail"
+<window id="junkMail"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         windowtype="mailnews:junk"
         title="&window.title;"
         onload="onJunkMailLoad()"
-        buttons="accept,cancel,help"
-        ondialogaccept="return onAccept();"
-        ondialoghelp="return doHelpButton();"
         persist="screenX screenY width height">
 
 <stringbundleset id="stringbundleset">
@@ -107,6 +104,10 @@
     </hbox>
   </vbox>
 
+  <separator/>
+
+  <hbox id="okCancelHelpButtonsRight"/>
+
 </vbox>
 
-</dialog>
+</window>