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

fix for #14604. pop migration was broken on mac.

Browse Source 
my code to migrate 4.x imap mail filters on the mac should only be run when we used pop in 4.x


git-svn-id: svn://10.0.0.236/trunk@48864 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%netscape.com
1999-09-22 20:01:20 +00:00
parent 2caf8aecc4
commit 0d4138f7c1
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/profile/pref-migrator/src/nsPrefMigration.cpp
View File

@@ -1112,19 +1112,20 @@ nsPrefMigration::DoSpecialUpdates(nsFileSpec profilePath)
// rename the bookmarks file, but only if we need to.
rv = Rename4xFileAfterMigration(profilePath,BOOKMARKS_FILE_NAME_IN_4x,BOOKMARKS_FILE_NAME_IN_5x);
if (NS_FAILED(rv)) return rv;
#ifdef IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x
rv = RenameAndMove4xImapFilterFiles(profilePath);
if (NS_FAILED(rv)) return rv;
#endif /* IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x */
/* Create the new mail directory from the setting in prefs.js or a default */
/* Create the new mail directory from the setting in prefs.js or a default */
rv = m_prefs->GetIntPref(PREF_MAIL_SERVER_TYPE, &serverType);
if (NS_FAILED(rv)) return rv;
if (serverType == POP_4X_MAIL_TYPE) {
rv = RenameAndMove4xPopFilterFile(profilePath);
if (NS_FAILED(rv)) return rv;
}
#ifdef IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x
else if (serverType == IMAP_4X_MAIL_TYPE) {
rv = RenameAndMove4xImapFilterFiles(profilePath);
if (NS_FAILED(rv)) return rv;
}
#endif /* IMAP_MAIL_FILTER_FILE_NAME_FORMAT_IN_4x */
return rv;
}