From f9c583a53cfd5c936698b35a6b251cd9fecb40f2 Mon Sep 17 00:00:00 2001
From: "bienvenu%nventure.com" <bienvenu%nventure.com>
Date: Tue, 23 Nov 2004 16:33:12 +0000
Subject: [PATCH] rest of fix for 181627 sr=mscott compact folders should
 display done status

---
 mail/base/content/mailWindow.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/mail/base/content/mailWindow.js b/mail/base/content/mailWindow.js
index a2c8476f3945..9c19f60d82e6 100644
--- a/mail/base/content/mailWindow.js
+++ b/mail/base/content/mailWindow.js
@@ -260,6 +260,7 @@ nsMsgStatusFeedback.prototype =
   progressMeterContainer : null,
   pendingStartRequests : 0,
   meteorsSpinning : false,
+  myDefaultStatus : null,
   progressMeterVisible : false,
 
   ensureStatusFields : function()
@@ -274,13 +275,21 @@ nsMsgStatusFeedback.prototype =
   // nsIXULBrowserWindow implementation
   setJSStatus : function(status)
     {
+      if (status.length > 0)
+        this.showStatusString(status);
     },
   setJSDefaultStatus : function(status)
     {
+      if (status.length > 0)
+      {
+        myDefaultStatus = status;
+        this.statusTextFld.label = status;
+      }
     },
   setOverLink : function(link)
     {
-      this.showStatusString(link);
+      this.ensureStatusFields();
+      this.statusTextFld.label = link;
     },
   QueryInterface : function(iid)
     {
@@ -295,8 +304,10 @@ nsMsgStatusFeedback.prototype =
   showStatusString : function(statusText)
     {
       this.ensureStatusFields();
-      if ( statusText == "" )
-        statusText = defaultStatus;
+      if ( !statusText.length )
+        statusText = myDefaultStatus;
+      else
+        myDefaultStatus = "";
       this.statusTextFld.label = statusText;
   },
   _startMeteors : function()
@@ -347,9 +358,7 @@ nsMsgStatusFeedback.prototype =
         gTimelineService.resetTimer("FolderLoading");
       }
       this.ensureStatusFields();
-      var msg = gMessengerBundle.getString("documentDone");
-      this.showStatusString(msg);
-      defaultStatus = msg;
+      this.showStatusString(defaultStatus);
       
       // stop the throbber
       if (this.throbber)