From b949ec1e13dab1ca0eae80280d140cdee1fadeb1 Mon Sep 17 00:00:00 2001
From: "cavin%netscape.com"
 <cavin%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 13 Mar 2002 22:36:24 +0000
Subject: [PATCH] Back out fix for 100385.

git-svn-id: svn://10.0.0.236/trunk@116494 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../mailnews/base/src/nsMessengerMigrator.cpp | 24 ++++---------------
 .../mailnews/base/src/nsMessengerMigrator.h   |  2 --
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp
index 291ead7a823..8f83d2ac19d 100644
--- a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp
+++ b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp
@@ -351,7 +351,10 @@ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
 NS_IMPL_ISUPPORTS2(nsMessengerMigrator, nsIMessengerMigrator, nsIObserver)
 
 nsMessengerMigrator::nsMessengerMigrator() :
-  m_haveShutdown(PR_FALSE)
+  m_haveShutdown(PR_FALSE),
+  m_oldMailType(-1),
+  m_alreadySetNntpDefaultLocalPath(PR_FALSE),
+  m_alreadySetImapDefaultLocalPath(PR_FALSE)
 {
 
   NS_INIT_REFCNT();
@@ -391,7 +394,7 @@ nsresult nsMessengerMigrator::Init()
   rv = getPrefService();
   if (NS_FAILED(rv)) return rv;   
 
-  rv = ResetState();
+  rv = m_prefs->GetIntPref(PREF_4X_MAIL_SERVER_TYPE, &m_oldMailType);
   return rv;
 }
 
@@ -609,20 +612,6 @@ nsMessengerMigrator::CreateLocalMailAccount(PRBool migrating)
   return NS_OK;
 }
 
-nsresult
-nsMessengerMigrator::ResetState()
-{
-  m_alreadySetNntpDefaultLocalPath = PR_FALSE;
-  m_alreadySetImapDefaultLocalPath = PR_FALSE;
-
-  // Reset 'm_oldMailType' in case the prefs file has changed. This is possible in quick launch
-  // mode where the profile to be migrated is IMAP type but the current working profile is POP.
-  nsresult rv = m_prefs->GetIntPref(PREF_4X_MAIL_SERVER_TYPE, &m_oldMailType);
-  if (NS_FAILED(rv))
-    m_oldMailType = -1;
-  return rv;
-}
-
 NS_IMETHODIMP
 nsMessengerMigrator::UpgradePrefs()
 {
@@ -631,9 +620,6 @@ nsMessengerMigrator::UpgradePrefs()
     rv = getPrefService();
     if (NS_FAILED(rv)) return rv;
 
-    // Reset some control vars, necessary in turbo mode.
-    ResetState();
-
     // because mail.server_type defaults to 0 (pop) it will look the user
     // has something to migrate, even with an empty prefs.js file
     // ProceedWithMigration will check if there is something to migrate
diff --git a/mozilla/mailnews/base/src/nsMessengerMigrator.h b/mozilla/mailnews/base/src/nsMessengerMigrator.h
index a46dcc468f7..010b6395be2 100644
--- a/mozilla/mailnews/base/src/nsMessengerMigrator.h
+++ b/mozilla/mailnews/base/src/nsMessengerMigrator.h
@@ -140,8 +140,6 @@ private:
 
   nsresult getPrefService();
   nsresult initializeStrings();
-  
-  nsresult ResetState();
 
   nsCOMPtr <nsIPref> m_prefs;
   PRBool m_haveShutdown;