From 0d4138f7c1b563fa0c292e59c9a32668944b932e Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Wed, 22 Sep 1999 20:01:20 +0000 Subject: [PATCH] fix for #14604. pop migration was broken on mac. 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 --- .../profile/pref-migrator/src/nsPrefMigration.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp index 2b181c48ea3..328aa013bc4 100644 --- a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp +++ b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp @@ -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; }