From ba594f9c4e88414a962f314288d4d8743d79f4b8 Mon Sep 17 00:00:00 2001
From: "neeti%netscape.com"
 <neeti%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 30 Mar 2000 04:25:07 +0000
Subject: [PATCH] bug 12423,Read user.js on startup after prefs.js is
 read.r=alecf

git-svn-id: svn://10.0.0.236/trunk@64567 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/libpref/src/nsPref.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/mozilla/modules/libpref/src/nsPref.cpp b/mozilla/modules/libpref/src/nsPref.cpp
index 568d0cfee58..28a4e38b987 100644
--- a/mozilla/modules/libpref/src/nsPref.cpp
+++ b/mozilla/modules/libpref/src/nsPref.cpp
@@ -221,7 +221,16 @@ nsresult nsPref::useUserPrefFile()
         if (NS_SUCCEEDED(rv) && userPrefFile) 
         {
             if (NS_SUCCEEDED(userPrefFile->AppendRelativeUnixPath((char*)userFiles[0])))
-                rv = ReadUserPrefsFrom(userPrefFile);
+            {
+                if (NS_FAILED(StartUp()))
+    	            return NS_ERROR_FAILURE;
+
+	            JS_BeginRequest(gMochaContext);
+                if (pref_OpenFileSpec(userPrefFile, PR_FALSE, PR_FALSE, PR_FALSE, PR_TRUE)
+                    != PREF_NOERROR)
+                    rv = NS_ERROR_FAILURE;
+                JS_EndRequest(gMochaContext);
+            }
         }
     }
     return rv;