Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bug 100414. Make sure that an account is created only when server and identity info is avialable in the migration process. r=mscott, sr=sspitzer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@111475 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
racham%netscape.com
2002-01-07 07:06:52 +00:00
parent 436a7fe313
commit d2eb40a48d
1 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
mozilla/mailnews/base/src/nsMessengerMigrator.cpp
View File

@@ -508,11 +508,6 @@ nsMessengerMigrator::CreateLocalMailAccount(PRBool migrating)
do_GetService(kMsgAccountManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
// create the account
nsCOMPtr<nsIMsgAccount> account;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// create the server
nsCOMPtr<nsIMsgIncomingServer> server;
rv = accountManager->CreateIncomingServer(LOCAL_MAIL_FAKE_USER_NAME,
@@ -594,6 +589,12 @@ nsMessengerMigrator::CreateLocalMailAccount(PRBool migrating)
}
}
// Create an account when valid server values are established.
// This will keep the status of accounts sane by avoiding the addition of incomplete accounts.
nsCOMPtr<nsIMsgAccount> account;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// notice, no identity for local mail
// hook the server to the account
// after we set the server's local path
@@ -1092,11 +1093,6 @@ nsMessengerMigrator::MigrateLocalMailAccount()
do_GetService(kMsgAccountManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
// create the account
nsCOMPtr<nsIMsgAccount> account;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// create the server
// "none" is the type we use for migrating 4.x "Local Mail"
nsCOMPtr<nsIMsgIncomingServer> server;
@@ -1186,6 +1182,12 @@ nsMessengerMigrator::MigrateLocalMailAccount()
rv = noneServer->CopyDefaultMessages("Templates",mailDirSpec);
if (NS_FAILED(rv)) return rv;
// Create an account when valid server values are established.
// This will keep the status of accounts sane by avoiding the addition of incomplete accounts.
nsCOMPtr<nsIMsgAccount> account;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// notice, no identity for local mail
// hook the server to the account
// after we set the server's local path
@@ -1206,16 +1208,12 @@ nsMessengerMigrator::MigrateMovemailAccount(nsIMsgIdentity *identity)
{
nsresult rv;
nsCOMPtr<nsIMsgAccount> account;
nsCOMPtr<nsIMsgIncomingServer> server;
nsCOMPtr<nsIMsgAccountManager> accountManager =
do_GetService(kMsgAccountManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// get the pop username
// movemail used the pop username in 4.x
nsXPIDLCString username;
@@ -1285,6 +1283,12 @@ nsMessengerMigrator::MigrateMovemailAccount(nsIMsgIdentity *identity)
if (!dirExists) {
mailDir->CreateDir();
}
// Create an account when valid server and identity values are established.
// This will keep the status of accounts sane by avoiding the addition of incomplete accounts.
nsCOMPtr<nsIMsgAccount> account;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// hook the server to the account
// before setting the copies and folder prefs
@@ -1323,13 +1327,8 @@ nsMessengerMigrator::MigratePopAccount(nsIMsgIdentity *identity)
do_GetService(kMsgAccountManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIMsgAccount> account;
nsCOMPtr<nsIMsgIncomingServer> server;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// get the pop username
nsXPIDLCString username;
rv = m_prefs->CopyCharPref(PREF_4X_MAIL_POP_NAME, getter_Copies(username));
@@ -1445,10 +1444,6 @@ nsMessengerMigrator::MigratePopAccount(nsIMsgIdentity *identity)
rv = SetSendLaterUriPref(server);
if (NS_FAILED(rv)) return rv;
// we could only have one pop account in 4.x, so we make it the default in 5.0
rv = accountManager->SetDefaultAccount(account);
NS_ENSURE_SUCCESS(rv, rv);
// Set check for new mail option for default account to TRUE
rv = server->SetLoginAtStartUp(PR_TRUE);
@@ -1457,6 +1452,12 @@ nsMessengerMigrator::MigratePopAccount(nsIMsgIdentity *identity)
rv = accountManager->CreateIdentity(getter_AddRefs(copied_identity));
if (NS_FAILED(rv)) return rv;
// Create an account when valid server and identity values are established.
// This will keep the status of accounts sane by avoiding the addition of incomplete accounts.
nsCOMPtr<nsIMsgAccount> account;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// hook the server to the account
// before setting the copies and folder prefs
// (see bug #31904)
@@ -1465,6 +1466,10 @@ nsMessengerMigrator::MigratePopAccount(nsIMsgIdentity *identity)
account->SetIncomingServer(server);
account->AddIdentity(copied_identity);
// we could only have one pop account in 4.x, so we make it the default in 5.0
rv = accountManager->SetDefaultAccount(account);
NS_ENSURE_SUCCESS(rv, rv);
// make this new identity a copy of the identity
// that we created out of the 4.x prefs
rv = copied_identity->Copy(identity);
@@ -1589,11 +1594,6 @@ nsMessengerMigrator::MigrateImapAccount(nsIMsgIdentity *identity, const char *ho
if (!hostAndPort) return NS_ERROR_NULL_POINTER;
// create the account
nsCOMPtr<nsIMsgAccount> account;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// get the old username
nsXPIDLCString username;
char *imapUsernamePref =
@@ -1739,6 +1739,12 @@ nsMessengerMigrator::MigrateImapAccount(nsIMsgIdentity *identity, const char *ho
rv = accountManager->CreateIdentity(getter_AddRefs(copied_identity));
if (NS_FAILED(rv)) return rv;
// Create an account when valid server and identity values are established.
// This will keep the status of accounts sane by avoiding the addition of incomplete accounts.
nsCOMPtr<nsIMsgAccount> account;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// hook the server to the account
// before setting the copies and folder prefs
// (see bug #31904)
@@ -2265,11 +2271,6 @@ nsMessengerMigrator::MigrateNewsAccount(nsIMsgIdentity *identity, const char *ho
if (!identity) return NS_ERROR_NULL_POINTER;
if (!hostAndPort) return NS_ERROR_NULL_POINTER;
// create the account
nsCOMPtr<nsIMsgAccount> account;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
PRInt32 port=-1;
nsCAutoString hostname(hostAndPort);
PRInt32 colonPos = hostname.FindChar(':');
@@ -2393,6 +2394,12 @@ nsMessengerMigrator::MigrateNewsAccount(nsIMsgIdentity *identity, const char *ho
rv = accountManager->CreateIdentity(getter_AddRefs(copied_identity));
if (NS_FAILED(rv)) return rv;
// Create an account when valid server and identity values are established.
// This will keep the status of accounts sane by avoiding the addition of incomplete accounts.
nsCOMPtr<nsIMsgAccount> account;
rv = accountManager->CreateAccount(getter_AddRefs(account));
if (NS_FAILED(rv)) return rv;
// hook the server to the account
// before setting the copies and folder prefs
// (see bug #31904)