Revert wallpaper from Bug 390451: Remembered passwords lost when changing Master Password. r=gavin
authordolske@mozilla.com
Wed, 22 Aug 2007 16:46:12 -0700
changeset 5181 96bf4b8dbeb6da8f7f7c7c3646aeed402fccda5b
parent 5180 367ee92e86189db131113e88354eb4cc082221a6
child 5182 06b87f5b5d0b1518bd9ef47aeb338e370b235a44
push idunknown
push userunknown
push dateunknown
reviewersgavin
bugs390451
milestone1.9a8pre
Revert wallpaper from Bug 390451: Remembered passwords lost when changing Master Password. r=gavin
browser/components/preferences/security.js
browser/components/preferences/security.xul
toolkit/mozapps/preferences/changemp.xul
toolkit/mozapps/preferences/removemp.xul
--- a/browser/components/preferences/security.js
+++ b/browser/components/preferences/security.js
@@ -356,18 +356,18 @@ var gSecurityPane = {
    * the master password button to show, and enables/disables it as necessary.
    * The master password is controlled by various bits of NSS functionality, so
    * the UI for it can't be controlled by the normal preference bindings.
    */
   _initMasterPasswordUI: function ()
   {
     var noMP = !this._masterPasswordSet();
 
-    //var button = document.getElementById("changeMasterPassword");
-    //button.disabled = noMP;
+    var button = document.getElementById("changeMasterPassword");
+    button.disabled = noMP;
 
     var checkbox = document.getElementById("useMasterPassword");
     checkbox.checked = !noMP;
   },
 
   /**
    * Returns true if the user has a master password set and false otherwise.
    */
--- a/browser/components/preferences/security.xul
+++ b/browser/components/preferences/security.xul
@@ -138,21 +138,21 @@
                   onsyncfrompreference="return gSecurityPane.readSavePasswords();"/>
         <button id="passwordExceptions"
                 label="&passwordExceptions.label;"
                 accesskey="&passwordExceptions.accesskey;"
                 oncommand="gSecurityPane.showPasswordExceptions();"
                 preference="pref.privacy.disable_button.view_passwords_exceptions"/>
       </hbox>
       <hbox id="masterPasswordBox">
-        <checkbox id="useMasterPassword" flex="1" disabled="true"
+        <checkbox id="useMasterPassword" flex="1"
                   oncommand="gSecurityPane.updateMasterPasswordButton();"
                   label="&useMasterPassword.label;"
                   accesskey="&useMasterPassword.accesskey;"/>
-        <button id="changeMasterPassword" disabled="true"
+        <button id="changeMasterPassword"
                 label="&changeMasterPassword.label;"
                 accesskey="&changeMasterPassword.accesskey;"
                 oncommand="gSecurityPane.changeMasterPassword();"/>
       </hbox>
 
       <hbox id="showPasswordsBox">
         <spacer flex="1"/>
         <button id="showPasswords"
--- a/toolkit/mozapps/preferences/changemp.xul
+++ b/toolkit/mozapps/preferences/changemp.xul
@@ -75,22 +75,22 @@
                 than one tokens, some initialized and some not - does not work properly. So, 
                 either the textbox 'oldpw' or the textbox 'message' would be displayed, 
                 depending on the state of the token selected 
           -->
           <textbox id="message" disabled="true" />
         </row>
         <row>
           <label control="pw1" value="&setPassword.newPassword.label;"/> 
-          <textbox id="pw1" type="password" disabled="true"
+          <textbox id="pw1" type="password" 
                    oninput="setPasswordStrength(); checkPasswords();"/> 
         </row>
         <row>
           <label control="pw2" value="&setPassword.reenterPassword.label;"/> 
-          <textbox id="pw2" type="password" disabled="true" oninput="checkPasswords();"/>  
+          <textbox id="pw2" type="password" oninput="checkPasswords();"/>  
         </row>
       </rows>
     </grid>
   </groupbox>
 
   <groupbox>
     <caption label="&setPassword.meter.label;"/>
     <progressmeter id="pwmeter" mode="determined" value="0"/>
--- a/toolkit/mozapps/preferences/removemp.xul
+++ b/toolkit/mozapps/preferences/removemp.xul
@@ -29,17 +29,17 @@
   
   <separator class="thin"/>
     
   <groupbox>
     <caption label="&removeInfo.label;"/>
 
     <hbox align="center">
       <label control="password" value="&setPassword.oldPassword.label;"/> 
-      <textbox id="password" type="password" disabled="true"
+      <textbox id="password" type="password"
                oninput="gRemovePasswordDialog.validateInput();"
                xhtml2:role="textfield" aaa:describedby="warnings"/>
     </hbox>
   </groupbox>
   
   <separator/>
 
 </dialog>