From 2f50472c00a37e16a33bcf9b3edd5e0888911b9d Mon Sep 17 00:00:00 2001
From: "mcmullen%netscape.com"
 <mcmullen%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 15 Jun 1999 06:42:23 +0000
Subject: [PATCH] conflict with profile checkin

git-svn-id: svn://10.0.0.236/trunk@35407 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/profile/src/nsProfile.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp
index 83b117df6d3..29942942f47 100644
--- a/mozilla/profile/src/nsProfile.cpp
+++ b/mozilla/profile/src/nsProfile.cpp
@@ -1906,15 +1906,12 @@ NS_IMETHODIMP nsProfile::MigrateProfile(const char* profileName)
 	}
 
     // Get current profile, make the new one a sibling...
-    rv = locator->GetFileLocation(nsSpecialFileSpec::App_UserProfileDirectory50, &newProfDir);
-
-	if (NS_FAILED(rv))
-	{
+	nsIFileSpec* newSpec = NS_LocateFileOrDirectory(
+        nsSpecialFileSpec::App_UserProfileDirectory50);
+	if (!newSpec)
 	     return NS_ERROR_FAILURE;
-	}
-
-	nsServiceManager::ReleaseService(kFileLocatorCID, locator);
-
+    newSpec->GetFileSpec(&newProfDir);
+	NS_RELEASE(newSpec);
 	newProfDir.SetLeafName(profileName);