Bug 520165 - Part 9 (Migration): fix dependancies, r=dietrich
authorMarco Bonardo <mbonardo@mozilla.com>
Fri, 15 Jan 2010 17:40:24 +0100
changeset 37229 219dd0ae24449d78616f7ff00d2a8cfc67a53b38
parent 37228 adc9abe1362f5ad5a721e5f2e6170773a6dff3bb
child 37230 a70955a44726fa54a8855de5854ac7b55b9e0ea7
push idunknown
push userunknown
push dateunknown
reviewersdietrich
bugs520165
milestone1.9.3a1pre
Bug 520165 - Part 9 (Migration): fix dependancies, r=dietrich
browser/components/migration/src/nsDogbertProfileMigrator.cpp
browser/components/migration/src/nsIEProfileMigrator.cpp
browser/components/migration/src/nsOperaProfileMigrator.cpp
browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp
--- a/browser/components/migration/src/nsDogbertProfileMigrator.cpp
+++ b/browser/components/migration/src/nsDogbertProfileMigrator.cpp
@@ -417,17 +417,16 @@ nsDogbertProfileMigrator::PrefTransform 
   // Prefs with Different Names
   { "network.hosts.socks_server",           "network.proxy.socks",                F(GetString),   F(SetString),  PR_FALSE, { -1 } },
   { "network.hosts.socks_serverport",       "network.proxy.socks_port",           F(GetInt),      F(SetInt),     PR_FALSE, { -1 } },
   { "browser.background_color",             "browser.display.background_color",   F(GetString),   F(SetString),  PR_FALSE, { -1 } },
   { "browser.foreground_color",             "browser.display.foreground_color",   F(GetString),   F(SetString),  PR_FALSE, { -1 } },
   { "browser.wfe.use_windows_colors",       "browser.display.use_system_colors",  F(GetBool),     F(SetBool),    PR_FALSE, { -1 } },
   { "browser.use_document_colors",          "browser.display.use_document_colors",F(GetBool),     F(SetBool),    PR_FALSE, { -1 } },
   { "browser.use_document.fonts",           "browser.display.use_document_fonts", F(GetInt),      F(SetInt),     PR_FALSE, { -1 } },
-  { "browser.link_expiration",              "browser.history_expire_days",        F(GetInt),      F(SetInt),     PR_FALSE, { -1 } },
   { "browser.startup.page",                 "browser.startup.homepage",           F(GetHomepage), F(SetWStringFromASCII), PR_FALSE, { -1 } },
   { "general.always_load_images",           "permissions.default.image",          F(GetImagePref),F(SetInt),     PR_FALSE, { -1 } },
 };
 
 nsresult
 nsDogbertProfileMigrator::TransformPreferences(const nsAString& aSourcePrefFileName,
                                                const nsAString& aTargetPrefFileName)
 {
--- a/browser/components/migration/src/nsIEProfileMigrator.cpp
+++ b/browser/components/migration/src/nsIEProfileMigrator.cpp
@@ -373,20 +373,16 @@ const regEntry gRegEntries[] = {
     "EnableHttp1_1",
     "network.http.version",
     TranslateDWORDtoHTTPVersion },
   { 0,
     "ProxyHttp1.1",
     "network.http.proxy.version",
     TranslateDWORDtoHTTPVersion },
 // SecureProtocols
-  { "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\Url History",
-    "DaysToKeep",
-    "browser.history_expire_days",
-    TranslateDWORDtoPRInt32 },
   { "Software\\Microsoft\\Internet Explorer\\Settings",
     "Always Use My Colors",            // XXX DWORD
     "browser.display.use_document_colors",
     TranslateYNtoFT },
   { 0,
     "Text Color",
     "browser.display.foreground_color",
     TranslateDRGBtoHRGB },
@@ -400,21 +396,17 @@ const regEntry gRegEntries[] = {
     TranslateDRGBtoHRGB },
   { 0,
     "Anchor Color Visited",
     "browser.visited_color",
     TranslateDRGBtoHRGB },
   { 0,
     "Always Use My Font Face",    // XXX DWORD
     "browser.display.use_document_fonts",
-    TranslateYNtoFT },
-  { "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\Url History",
-    "DaysToKeep",
-    "browser.history_expire_days",
-    TranslateDWORDtoPRInt32 }
+    TranslateYNtoFT }
 };
 
 #if 0
 user_pref("font.size.fixed.x-western", 14);
 user_pref("font.size.variable.x-western", 15);
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
--- a/browser/components/migration/src/nsOperaProfileMigrator.cpp
+++ b/browser/components/migration/src/nsOperaProfileMigrator.cpp
@@ -322,17 +322,16 @@ nsOperaProfileMigrator::PrefTransform gT
   { nsnull, "Allow script to raise window", _OPM(BOOL), "dom.disable_window_flip", _OPM(SetBool), PR_FALSE, { -1 } },
   { nsnull, "Allow script to change status", _OPM(BOOL), "dom.disable_window_status_change", _OPM(SetBool), PR_FALSE, { -1 } },
   { nsnull, "Ignore Unrequested Popups", _OPM(BOOL), "dom.disable_open_during_load", _OPM(SetBool), PR_FALSE, { -1 } },
   { nsnull, "Load Figures", _OPM(BOOL), "permissions.default.image", _OPM(SetImageBehavior), PR_FALSE, { -1 } },
 
   { "Visited link", nsnull, _OPM(COLOR), "browser.visited_color", _OPM(SetString), PR_FALSE, { -1 } },
   { "Link", nsnull, _OPM(COLOR), "browser.anchor_color", _OPM(SetString), PR_FALSE, { -1 } },
   { nsnull, "Underline", _OPM(BOOL), "browser.underline_anchors", _OPM(SetBool), PR_FALSE, { -1 } },
-  { nsnull, "Expiry", _OPM(INT), "browser.history_expire_days", _OPM(SetInt), PR_FALSE, { -1 } },
 
   { "Security Prefs", "Enable SSL v2", _OPM(BOOL), "security.enable_ssl2", _OPM(SetBool), PR_FALSE, { -1 } },
   { nsnull, "Enable SSL v3", _OPM(BOOL), "security.enable_ssl3", _OPM(SetBool), PR_FALSE, { -1 } },
   { nsnull, "Enable TLS v1.0", _OPM(BOOL), "security.enable_tls", _OPM(SetBool), PR_FALSE, { -1 } },
 
   { "Extensions", "Scripting", _OPM(BOOL), "javascript.enabled", _OPM(SetBool), PR_FALSE, { -1 } }
 };
 
--- a/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp
+++ b/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp
@@ -344,17 +344,16 @@ nsSeamonkeyProfileMigrator::FillProfileD
 
 #define MAKESAMETYPEPREFTRANSFORM(pref, method) \
   { pref, 0, F(Get##method), F(Set##method), PR_FALSE, { -1 } }
 
 
 static 
 nsSeamonkeyProfileMigrator::PrefTransform gTransforms[] = {
   MAKESAMETYPEPREFTRANSFORM("signon.SignonFileName",                    String),
-  MAKESAMETYPEPREFTRANSFORM("browser.history_expire_days",              Int),
   MAKESAMETYPEPREFTRANSFORM("browser.tabs.autoHide",                    Bool),
   MAKESAMETYPEPREFTRANSFORM("browser.tabs.loadInBackground",            Bool),
   MAKESAMETYPEPREFTRANSFORM("browser.enable_automatic_image_resizing",  Bool),
   MAKESAMETYPEPREFTRANSFORM("network.cookie.warnAboutCookies",          Bool),
   MAKESAMETYPEPREFTRANSFORM("network.cookie.lifetime.enabled",          Bool),
   MAKESAMETYPEPREFTRANSFORM("network.cookie.lifetime.behavior",         Int),
   MAKESAMETYPEPREFTRANSFORM("dom.disable_open_during_load",             Bool),
   MAKESAMETYPEPREFTRANSFORM("signon.rememberSignons",                   Bool),