bug 112908 patch by rossi@telnet.at r=biesi sr=alecf

Error in walletOverlay.js on startup [redeclaration of const hide]

extensions/wallet/resources/content/walletOverlay.js

@@ -356,10 +356,6 @@
     // display a Wallet Dialog
     function WalletDialog(which) {
       switch( which ) {
-        case "signon":
-          window.openDialog("chrome://communicator/content/wallet/SignonViewer.xul",
-                            "_blank","chrome,resizable=yes","S"); 
-          break;
         case "samples":
           window._content.location.href = 'chrome://communicator/locale/wallet/index.html';
           break;

extensions/wallet/resources/content/walletTasksOverlay.xul

@@ -27,13 +27,11 @@
 <overlay id="walletTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
-
   <script type="application/x-javascript">
   <![CDATA[
 
     // expire master password
-    function Expire() {
+    function walletPasswordExpire() {
       var wallet = Components.classes['@mozilla.org/wallet/wallet-service;1'];
       wallet = wallet.getService();
       wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
@@ -46,6 +44,11 @@
       }
     }
 
+    function walletPasswordDialog() {
+      window.openDialog("chrome://communicator/content/wallet/SignonViewer.xul",
+                        "_blank","chrome,resizable=yes","S");
+    }
+
   ]]>
   </script>         
 
@@ -61,10 +64,10 @@
       <menupopup>
         <menuitem label="&walletExpirePasswordCmd.label;"
                   accesskey="&walletExpirePasswordCmd.accesskey;"
-                  oncommand="Expire();"/>
+                  oncommand="walletPasswordExpire();"/>
         <menuitem label="&walletDisplaySignonsCmd.label;"
                   accesskey="&walletDisplaySignonsCmd.accesskey;"
-                  oncommand="WalletDialog('signon');"/> 
+                  oncommand="walletPasswordDialog();"/> 
       </menupopup>
     </menu>
   </menupopup>