Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix more bugs with migration on the mac.

Browse Source
This commit is contained in:
sspitzer%netscape.com 1999-09-28 11:40:33 +00:00
parent 99555180c2
commit 1d2f766b92
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mailnews/base/src/nsMsgAccountManager.cpp
View File

@ -1697,8 +1697,7 @@ nsMsgAccountManager::CreateLocalMailAccount(nsIMsgIdentity *identity)
// if the "mail.directory" pref is set, use that. // if the "mail.directory" pref is set, use that.
// if they used -installer, this pref will point to where their files got copied // if they used -installer, this pref will point to where their files got copied
if (identity) { if (identity) {
nsCOMPtr <nsIFileSpec> mail_dir; rv = m_prefs->GetFilePref(PREF_MAIL_DIRECTORY, getter_AddRefs(mailDir));
rv = m_prefs->GetFilePref(PREF_MAIL_DIRECTORY, getter_AddRefs(mail_dir));
} }
else { else {
rv = NS_ERROR_FAILURE; rv = NS_ERROR_FAILURE;
@ -2180,6 +2179,7 @@ nsresult
nsMsgAccountManager::MigrateNewsAccounts(nsIMsgIdentity *identity) nsMsgAccountManager::MigrateNewsAccounts(nsIMsgIdentity *identity)
{ {
nsresult rv; nsresult rv;
nsCOMPtr <nsIFileSpec> news_dir;
nsFileSpec newsrcDir; // the directory that holds the newsrc files (and the fat file, if we are using one) nsFileSpec newsrcDir; // the directory that holds the newsrc files (and the fat file, if we are using one)
nsFileSpec newsHostsDir; // the directory that holds the host directory, and the summary files. nsFileSpec newsHostsDir; // the directory that holds the host directory, and the summary files.
nsFileSpec profileDir; nsFileSpec profileDir;
@ -2196,8 +2196,10 @@ nsMsgAccountManager::MigrateNewsAccounts(nsIMsgIdentity *identity)
// the newsrc files lived. we don't want that for the newsHostsDir. // the newsrc files lived. we don't want that for the newsHostsDir.
#ifdef USE_NEWSRC_MAP_FILE #ifdef USE_NEWSRC_MAP_FILE
// if they used -installer, this pref will point to where their files got copied // if they used -installer, this pref will point to where their files got copied
nsCOMPtr <nsIFileSpec> news_dir;
rv = m_prefs->GetFilePref(PREF_NEWS_DIRECTORY, getter_AddRefs(news_dir)); rv = m_prefs->GetFilePref(PREF_NEWS_DIRECTORY, getter_AddRefs(news_dir));
if (NS_SUCCEEDED(rv)) {
rv = news_dir->GetFileSpec(&newsHostsDir);
}
#else #else
rv = NS_ERROR_FAILURE; rv = NS_ERROR_FAILURE;
#endif /* USE_NEWSRC_MAP_FILE */ #endif /* USE_NEWSRC_MAP_FILE */
@ -2328,7 +2330,6 @@ nsMsgAccountManager::MigrateNewsAccounts(nsIMsgIdentity *identity)
inputStream.close(); inputStream.close();
#else /* USE_NEWSRC_MAP_FILE */ #else /* USE_NEWSRC_MAP_FILE */
nsCOMPtr <nsIFileSpec> news_dir;
rv = m_prefs->GetFilePref(PREF_PREMIGRATION_NEWS_DIRECTORY, getter_AddRefs(news_dir)); rv = m_prefs->GetFilePref(PREF_PREMIGRATION_NEWS_DIRECTORY, getter_AddRefs(news_dir));
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
#ifdef DEBUG_ACCOUNTMANAGER #ifdef DEBUG_ACCOUNTMANAGER