Bug 698437 following - fix it properly for suite. r+=Neil over IRC
authorJustin Wood <Callek@gmail.com>
Mon, 12 Dec 2011 07:33:28 -0500
changeset 9971 7814c0f2732db09c21edc4784844a80bf11c918b
parent 9970 1afd843a67b122114438dfb7f9cd3f6524bf78d1
child 9972 9256a778fe82bca0aae48924baedc92c6087ed71
push id336
push userbugzilla@standard8.plus.com
push dateTue, 31 Jan 2012 22:15:45 +0000
treeherdercomm-beta@54945f5d278d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs698437
Bug 698437 following - fix it properly for suite. r+=Neil over IRC
suite/profile/migration/src/nsProfileMigrator.cpp
--- a/suite/profile/migration/src/nsProfileMigrator.cpp
+++ b/suite/profile/migration/src/nsProfileMigrator.cpp
@@ -102,30 +102,36 @@ nsProfileMigrator::Migrate(nsIProfileSta
                         getter_AddRefs(migrateWizard));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // nsProfileMigrator
 
 NS_IMPL_ISUPPORTS1(nsProfileMigrator, nsIProfileMigrator)
 
+#if 0
+
 struct sInternalNameToMigratorName {
   const char* internalName;
   const char* key;
 };
 
 static const sInternalNameToMigratorName nameMap[] = {
   // Possiblities for migrators when/if we have them
   // ("iexplore", "ie"),
   // ("opera", "opera"),
   // ("firebird", "firefox"), Note: Internally the firebird->firefox migrator
   // ("firefox", "firefox"),  in firefox is known as phoenix.
   // ("phoenix", "firefox"),
+  // ("seamonkey", "seamonkey"),
+  // ("apprunner", "seamonkey")
 };
 
+#endif 
+
 static const char* migratorNames[] = {
   "thunderbird"
 };
 
 // The purpose of this function is to attempt to get the default item
 // to migrate from the default browser key. If for some reason we haven't
 // got a default browser (e.g. wrong os) or we haven't got a migrator for
 // the default browser, then we'll just return a migrator which has profiles
@@ -135,17 +141,17 @@ nsProfileMigrator::GetSuiteMigratorKey(n
                                        nsISuiteProfileMigrator** spm)
 {
   *spm = nsnull;
 
   // Declare these here because of the #if - we need them in both bits
   bool exists = false;
   nsCString migratorID;
   nsCOMPtr<nsISuiteProfileMigrator> result;
-#if XP_WIN
+#if 0 && XP_WIN
 
   nsCOMPtr<nsIWindowsRegKey> regKey =
     do_CreateInstance("@mozilla.org/windows-registry-key;1");
   if (!regKey)
     return NS_ERROR_FAILURE;
 
   NS_NAMED_LITERAL_STRING(kCommandKey,
                           "SOFTWARE\\Classes\\HTTP\\shell\\open\\command");