Revert wallpaper from Bug 390451: Remembered passwords lost when changing Master Password. r=gavin

browser/components/preferences/security.js

@@ -361,8 +361,8 @@ var gSecurityPane = {
   {
     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;

browser/components/preferences/security.xul

@@ -143,11 +143,11 @@
                 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();"/>

toolkit/mozapps/preferences/changemp.xul

@@ -80,12 +80,12 @@
         </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>

toolkit/mozapps/preferences/removemp.xul

@@ -34,7 +34,7 @@
 
     <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>