From c80dd38cc45db2b10c242ebaca4b84853daf227d Mon Sep 17 00:00:00 2001 From: "ben%bengoodger.com" Date: Wed, 29 Sep 2004 07:34:59 +0000 Subject: [PATCH] 249302 - Firefox offers to migrate a non-existant Phoenix Firebird Firefox profile... add "fromfile" to the exclusion conditions... *smacks vlad* git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@162940 18797224-902f-48f8-a5cc-f745e15eee43 --- .../browser/components/migration/content/migration.js | 10 ++++++++-- .../browser/components/migration/content/migration.xul | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mozilla/browser/components/migration/content/migration.js b/mozilla/browser/components/migration/content/migration.js index 42e365b801b..bba0aa021eb 100644 --- a/mozilla/browser/components/migration/content/migration.js +++ b/mozilla/browser/components/migration/content/migration.js @@ -71,9 +71,15 @@ var MigrationWizard = { var group = document.getElementById("importSourceGroup"); for (var i = 0; i < group.childNodes.length; ++i) { var suffix = group.childNodes[i].id; - if (suffix != "nothing") { + if (suffix != "nothing" && suffix != "fromfile") { var contractID = kProfileMigratorContractIDPrefix + suffix; - var migrator = Components.classes[contractID].createInstance(kIMig); + try { + var migrator = Components.classes[contractID].createInstance(kIMig); + } + catch (e) { + dump("*** eeee!!! contractID =" + contractID + "\n"); + return; + } if (!migrator.sourceExists) group.childNodes[i].hidden = true; } diff --git a/mozilla/browser/components/migration/content/migration.xul b/mozilla/browser/components/migration/content/migration.xul index 622fd4f6334..cbfc97494c3 100644 --- a/mozilla/browser/components/migration/content/migration.xul +++ b/mozilla/browser/components/migration/content/migration.xul @@ -62,7 +62,7 @@ #endif - +