From c4d0f8d56da91bae8db47fac8fed4da62f76db2e Mon Sep 17 00:00:00 2001 From: "bienvenu%nventure.com" Date: Sat, 24 Mar 2007 00:18:58 +0000 Subject: [PATCH] turn off 4.x migration for movemail accounts for now to fix build bustage git-svn-id: svn://10.0.0.236/trunk@222300 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/base/src/nsMessengerMigrator.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp index 3d66c043e4c..42bae2e9380 100644 --- a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp +++ b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp @@ -1274,8 +1274,8 @@ nsMessengerMigrator::MigrateLocalMailAccount() nsresult nsMessengerMigrator::MigrateMovemailAccount(nsIMsgIdentity *identity) { - nsresult rv; - + nsresult rv = NS_OK; +#if 0 // turn off movemail migration for now. nsCOMPtr server; nsCOMPtr accountManager = @@ -1327,10 +1327,10 @@ nsMessengerMigrator::MigrateMovemailAccount(nsIMsgIdentity *identity) } // set the default local path for "none" (eventually, "movemail") - rv = server->SetDefaultLocalPath(mailDir); + rv = server->SetDefaultLocalPath(aFile); if (NS_FAILED(rv)) return rv; - rv = mailDir->Exists(&dirExists); + rv = aFile->Exists(&dirExists); if (!dirExists) { mailDir->CreateDir(); } @@ -1379,6 +1379,7 @@ nsMessengerMigrator::MigrateMovemailAccount(nsIMsgIdentity *identity) // we could only have one movemail account in 4.x, so we make it the default in 5.0 rv = accountManager->SetDefaultAccount(account); +#endif // 0 return rv; } #endif /* HAVE_MOVEMAIL */