add log-out ability to password manager

extensions/wallet/public/nsIWalletService.idl

@@ -54,6 +54,7 @@ interface nsIWalletService : nsISupports {
   void WALLET_Prefill(in nsIPresShell shell, in boolean quick);
   [noscript]void WALLET_PrefillReturn(in nsAutoString results);
   void WALLET_FetchFromNetCenter();
+  void WALLET_ExpirePassword();
 
   boolean PromptUsernameAndPasswordURL(in wstring text, out wstring user, out wstring pwd, in string urlname, in boolean stripUrl, in nsIPrompt dialog);
   boolean PromptPasswordURL(in wstring text, out wstring pwd, in string urlname, in boolean stripUrl, in nsIPrompt dialog);

extensions/wallet/src/nsWalletService.cpp

@@ -104,6 +104,11 @@ NS_IMETHODIMP nsWalletlibService::WALLET_FetchFromNetCenter(){
   return NS_OK;
 }
 
+NS_IMETHODIMP nsWalletlibService::WALLET_ExpirePassword(){
+  ::WLLT_ExpirePassword();
+  return NS_OK;
+}
+
 NS_IMETHODIMP nsWalletlibService::PromptUsernameAndPasswordURL
     (const PRUnichar *text, PRUnichar **user, PRUnichar **pwd,
      const char *urlname, PRBool stripUrl, nsIPrompt* dialog, PRBool *returnValue) {

extensions/wallet/src/nsWalletService.h

@@ -50,6 +50,7 @@ public:
   NS_IMETHOD WALLET_Prefill(nsIPresShell* shell, PRBool quick);
   NS_IMETHOD WALLET_PrefillReturn(nsAutoString results);
   NS_IMETHOD WALLET_FetchFromNetCenter();
+  NS_IMETHOD WALLET_ExpirePassword();
 
   NS_IMETHOD PromptUsernameAndPasswordURL
     (const PRUnichar *text, PRUnichar **user, PRUnichar **pwd,

extensions/wallet/src/wallet.cpp

@@ -1523,11 +1523,12 @@ Wallet_KeyResetTime() {
   }
 }
 
-PRIVATE void
+PUBLIC void
-wallet_KeyTimeoutImmediately() {
+WLLT_ExpirePassword() {
   if (Wallet_IsKeySet()) {
     keyExpiresTime = time(NULL);
   }
+  SI_RemoveAllSignonData();
 }
 
 PUBLIC PRBool
@@ -2927,8 +2928,7 @@ void WLLT_ChangePassword() {
   }
 
   /* force the user to supply old database key, for security */
-  wallet_KeyTimeoutImmediately();
+  WLLT_ExpirePassword();
-  SI_RemoveAllSignonData();
 
   /* read in user data using old key */
   wallet_Initialize(PR_FALSE);

extensions/wallet/src/wallet.h

@@ -70,6 +70,9 @@ WLLT_OnSubmit (nsIContent* formNode);
 extern void
 WLLT_FetchFromNetCenter();
 
+extern void
+WLLT_ExpirePassword();
+
 extern NS_METHOD
 Wallet_GetMasterPassword(PRUnichar **password);
 

xpfe/global/resources/content/tasksOverlay.js

@@ -253,13 +253,16 @@ function CheckForWallet()
 // perform a wallet action
 function WalletAction( action ) 
 {
-
+  if (action == "password" || action == "expire") {
-  if (action == "password") {
-    /* process "password" independent of appcore so it can be called from mail */
     wallet = Components.classes['component://netscape/wallet'];
     wallet = wallet.getService();
     wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
-    wallet.WALLET_ChangePassword();
+
+    if (action == "password") {
+      wallet.WALLET_ChangePassword();
+    } else if (action == "expire") {
+      wallet.WALLET_ExpirePassword();
+    }
     return;
   }
 

xpfe/global/resources/content/tasksOverlay.xul

@@ -40,6 +40,7 @@
                 <menupopup>
                   <menuitem value="&walletDisplaySignonsCmd.label;" oncommand="WalletDialog('signon');"/> 
                   <menuitem value="&walletChangePasswordCmd.label;" oncommand="WalletAction('password');"/>
+                  <menuitem value="&walletExpirePasswordCmd.label;" oncommand="WalletAction('expire');"/>
                 </menupopup>
               </menu>
               <menu value="&walletCookieManager.label;">

xpfe/global/resources/locale/en-US/tasksOverlay.dtd

@@ -37,5 +37,6 @@
 <!ENTITY walletInterviewCmd.label "Interview">
 <!ENTITY walletSamplesCmd.label "Demonstration">
 <!ENTITY walletChangePasswordCmd.label "Change Master Password...">
+<!ENTITY walletExpirePasswordCmd.label "Log Out">
 <!ENTITY walletCookieManager.label "Cookie Manager">
 <!ENTITY walletImageManager.label "Image Manager">