From 38de3b0bf3edd0dc8a77c68c56afc42d7c4eb748 Mon Sep 17 00:00:00 2001
From: "morse%netscape.com" <morse%netscape.com>
Date: Mon, 15 Oct 2001 22:42:48 +0000
Subject: [PATCH] bug 102709, wallet: keep encrypted state and clear master
 password on delete-all, r=jag, sr=alecf

---
 .../resources/content/walletTasksOverlay.xul     | 16 +++++++++++++---
 .../locale/en-US/walletTasksOverlay.dtd          |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/extensions/wallet/resources/content/walletTasksOverlay.xul b/extensions/wallet/resources/content/walletTasksOverlay.xul
index e8e48348aff8..7bb353681bac 100644
--- a/extensions/wallet/resources/content/walletTasksOverlay.xul
+++ b/extensions/wallet/resources/content/walletTasksOverlay.xul
@@ -88,9 +88,12 @@
           }
           break;
         case "clear":
-          if (window.confirm(strings.getAttribute("AllDataWillBeCleared"))) {
-            wallet.WALLET_DeleteAll();
-          }
+
+          var pipNSSBundle = document.getElementById("bundle_pipnss");
+          var tokenName = pipNSSBundle.getString("InternalToken");
+          window.open("chrome://pippki/content/resetpassword.xul",
+                      tokenName,
+                      "centerscreen,chrome,resizable=1,modal=1,dialog=1");
           break;
         case "encrypt":
           if (pref) {
@@ -219,4 +222,11 @@
       </menupopup>
     </menu>
   </menupopup>
+
+  <stringbundleset id="stringbundleset">
+    <stringbundle id="bundle_pipnss"
+                  src="chrome://pipnss/locale/pipnss.properties"/>
+  </stringbundleset>
+
+
 </overlay>
diff --git a/extensions/wallet/resources/locale/en-US/walletTasksOverlay.dtd b/extensions/wallet/resources/locale/en-US/walletTasksOverlay.dtd
index 2996c30d59d5..c501ec553a2b 100644
--- a/extensions/wallet/resources/locale/en-US/walletTasksOverlay.dtd
+++ b/extensions/wallet/resources/locale/en-US/walletTasksOverlay.dtd
@@ -26,7 +26,7 @@
 <!ENTITY walletEncryptCmd.accesskey "e">
 <!ENTITY walletObscureCmd.label "Obscure Sensitive Information">
 <!ENTITY walletObscureCmd.accesskey "o">
-<!ENTITY walletClearCmd.label "Clear Sensitive Information">
+<!ENTITY walletClearCmd.label "Reset Master Password">
 <!ENTITY walletClearCmd.accesskey "r">
 
 <!ENTITY PasswordNotChanged "Unable to change the password that protects your sensitive information.">