From cd2d6954681b8e5eb1cd2b8a2a64a784607c80c4 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Sat, 23 Feb 2002 00:07:16 +0000
Subject: [PATCH] Download manager. Not part of build.

---
 .../download-manager/resources/content/downloadmanager.js     | 2 +-
 .../download-manager/resources/content/downloadmanager.xul    | 1 -
 xpfe/components/download-manager/src/nsDownloadManager.cpp    | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/xpfe/components/download-manager/resources/content/downloadmanager.js b/xpfe/components/download-manager/resources/content/downloadmanager.js
index 16119104137c..ccd1a21687d9 100644
--- a/xpfe/components/download-manager/resources/content/downloadmanager.js
+++ b/xpfe/components/download-manager/resources/content/downloadmanager.js
@@ -111,7 +111,7 @@ var downloadViewController = {
       return selectionCount > 0;
     case "cmd_remove":
       // XXX ensure selection isn't still in progress
-      //     how to handle multiple selection?
+      //     and how to handle multiple selection?
       return selectionCount > 0;
     case "cmd_selectAll":
       return gDownloadViewChildren.childNodes.length != selectionCount;
diff --git a/xpfe/components/download-manager/resources/content/downloadmanager.xul b/xpfe/components/download-manager/resources/content/downloadmanager.xul
index 6d4620a9d0dc..a08c7cc2637c 100644
--- a/xpfe/components/download-manager/resources/content/downloadmanager.xul
+++ b/xpfe/components/download-manager/resources/content/downloadmanager.xul
@@ -50,7 +50,6 @@
   <script type="application/x-javascript" src="chrome://global/content/treePopups.js"/>
 
   <script type="application/x-javascript" src="chrome://communicator/content/downloadmanager/downloadmanager.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/downloadmanager/nsDownloadProgressListener.js"/>
 
   <stringbundle id="downloadBundle" 
                 src="chrome://communicator/locale/downloadmanager/downloadmanager.properties"/>
diff --git a/xpfe/components/download-manager/src/nsDownloadManager.cpp b/xpfe/components/download-manager/src/nsDownloadManager.cpp
index 02d5fa32d43b..875885f4381f 100644
--- a/xpfe/components/download-manager/src/nsDownloadManager.cpp
+++ b/xpfe/components/download-manager/src/nsDownloadManager.cpp
@@ -54,7 +54,7 @@
 
 /* Outstanding issues/todo:
  * 1. Using the target path as an identifier is not sufficient because it's not unique on mac.
- * 2. Implement pause/resume
+ * 2. Implement pause/resume.
  */
   
 static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
@@ -403,7 +403,7 @@ nsDownloadManager::CancelDownload(const char* aKey)
     nsCOMPtr<nsIWebBrowserPersist> persist;
     item->GetPersist(getter_AddRefs(persist));
     if (persist)
-      persist->CancelSave();
+      rv = persist->CancelSave();
 
     // if an observer was provided, notify that the download was cancelled.
     // if no persist was provided, this is necessary so that whatever transfer