Bug 517478 - signon.expireMasterPassword is obsolete and should be removed; (Cv1-SM) Remove all pref support

r+sr=neil a-seamonkey2.0=kairo

suite/profile/migration/src/nsSeamonkeyProfileMigrator.cpp

@@ -564,7 +564,6 @@ nsSeamonkeyProfileMigrator::PrefTransform gTransforms[] = {
 
   MAKESAMETYPEPREFTRANSFORM("signon.SignonFileName",                   String),
   MAKESAMETYPEPREFTRANSFORM("signon.rememberSignons",                  Bool),
-  MAKESAMETYPEPREFTRANSFORM("signon.expireMasterPassword",             Bool),
 
   MAKESAMETYPEPREFTRANSFORM("slider.snapMultiplier",                   Int),
 

suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp

@@ -524,7 +524,7 @@ nsThunderbirdProfileMigrator::PrefTransform gTransforms[] = {
 
   MAKESAMETYPEPREFTRANSFORM("signon.SignonFileName",                   String),
   MAKESAMETYPEPREFTRANSFORM("signon.rememberSignons",                  Bool),
-  MAKESAMETYPEPREFTRANSFORM("signon.expireMasterPassword",             Bool),
+
   MAKESAMETYPEPREFTRANSFORM("slider.snapMultiplier",                   Int),
   MAKESAMETYPEPREFTRANSFORM("startup.homepage_override_url",           String),
 

suite/security/prefs/pref-masterpass.js

@@ -81,9 +81,6 @@ function WriteAskForPassword(field) {
   var timeout = gInternalToken.getAskPasswordTimeout();
   gInternalToken.setAskPasswordDefaults(askTimes, timeout);
 
-  var prefExpire = document.getElementById("signon.expireMasterPassword");
-  prefExpire.value = (field.value == 1);
-
   return field.value;
 }
 

suite/security/prefs/pref-masterpass.xul

@@ -1,4 +1,4 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 <!-- ***** BEGIN LICENSE BLOCK *****
    - Version: MPL 1.1/GPL 2.0/LGPL 2.1
    -
@@ -51,16 +51,10 @@
             label="&pref.masterpass.title;"
             script="chrome://pippki/content/pref-masterpass.js">
 
-             
-    <!--      onload="onMasterPasswordLoad();"-->
-
     <preferences id="masterpass_preferences">
       <preference id="security.disable_button.changePassword"
                   name="security.disable_button.changePassword"
                   type="bool"/>
-      <preference id="signon.expireMasterPassword"
-                  name="signon.expireMasterPassword"
-                  type="bool"/>
       <preference id="security.ask_for_password"
                   name="security.ask_for_password"
                   type="int"