From 56ec9679a07ff8ea6d03368b94db303dcde4a259 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com"
 <blakeross%telocity.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 6 Mar 2002 03:11:48 +0000
Subject: [PATCH] Download manager. Not part of build. a=asa

git-svn-id: svn://10.0.0.236/trunk@115920 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../resources/locale/downloadmanager.ent               |  2 +-
 .../download-manager/src/nsDownloadManager.cpp         | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mozilla/xpfe/components/download-manager/resources/locale/downloadmanager.ent b/mozilla/xpfe/components/download-manager/resources/locale/downloadmanager.ent
index 63c2448dda0..2dbcb3d7554 100644
--- a/mozilla/xpfe/components/download-manager/resources/locale/downloadmanager.ent
+++ b/mozilla/xpfe/components/download-manager/resources/locale/downloadmanager.ent
@@ -5,7 +5,7 @@
 <!ENTITY view.header.transferred.label    "Transferred">
 <!ENTITY view.header.transferrate.label   "Speed">
 <!ENTITY view.header.timeelapsed.label    "Time Elapsed">
-<!ENTITY view.header.progresstext.label   "Percent Done">
+<!ENTITY view.header.progresstext.label   "%">
 <!ENTITY view.header.source.label         "Source">
 
 <!ENTITY downloadManager.title            "Download Manager">
diff --git a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
index 4fd99b169a2..6204d10ad15 100644
--- a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
+++ b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
@@ -544,6 +544,16 @@ nsDownloadManager::CancelDownload(const char* aPersistentDescriptor)
     if (NS_FAILED(rv)) return rv;
   }
   
+  // if there's a progress dialog open for the item,
+  // we have to notify it that we're cancelling
+  nsCOMPtr<nsIProgressDialog> dialog;
+  internalDownload->GetDialog(getter_AddRefs(dialog));
+  if (dialog) {
+    observer = do_QueryInterface(dialog);
+    rv = observer->Observe(download, "oncancel", nsnull);
+    if (NS_FAILED(rv)) return rv;
+  }
+  
   return rv;
 }