From 5ef6ed9e0f67236361757b429ac2cd52f8df8d18 Mon Sep 17 00:00:00 2001 From: "morse%netscape.com" Date: Sat, 30 Jun 2001 00:38:31 +0000 Subject: [PATCH] still trying to back out last change and get back to version 1.287 git-svn-id: svn://10.0.0.236/trunk@98341 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/bootstrap/nsAppRunner.cpp | 39 -------------------------- 1 file changed, 39 deletions(-) diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp index e4895a4332b..774ab3fbfe3 100644 --- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp +++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp @@ -686,43 +686,6 @@ static nsresult OpenBrowserWindow(PRInt32 height, PRInt32 width) } -static void InitCachePrefs() -{ - const char * const CACHE_DIR_PREF = "browser.cache.directory"; - nsresult rv; - PRBool isDir = PR_FALSE; - nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); - if (NS_FAILED(rv)) return; - - // If the pref is already set don't do anything - nsCOMPtr cacheDir; - rv = prefs->GetFileXPref(CACHE_DIR_PREF, getter_AddRefs(cacheDir)); - if (NS_SUCCEEDED(rv) && cacheDir.get()) { - rv = cacheDir->IsDirectory(&isDir); - if (NS_SUCCEEDED(rv) && isDir) - return; - } - // Set up the new pref - - nsCOMPtr profileDir; - rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileDir)); - NS_ASSERTION(profileDir, "NS_APP_USER_PROFILE_50_DIR is not defined"); - if (NS_FAILED(rv)) return; - - cacheDir = do_QueryInterface(profileDir); - NS_ASSERTION(cacheDir, "Cannot get nsILocalFile from cache dir"); - - PRBool exists; - cacheDir->Append("Cache"); - rv = cacheDir->Exists(&exists); - if (NS_SUCCEEDED(rv) && !exists) - rv = cacheDir->Create(nsIFile::DIRECTORY_TYPE, 0775); - if (NS_FAILED(rv)) return; - - prefs->SetFileXPref(CACHE_DIR_PREF, cacheDir); -} - - static nsresult Ensure1Window( nsICmdLineService* cmdLineArgs) { nsresult rv; @@ -1204,8 +1167,6 @@ static nsresult main1(int argc, char* argv[], nsISupports *nativeApp ) // Startup wallet service so it registers for notifications nsCOMPtr walletService(do_GetService(NS_WALLETSERVICE_CONTRACTID, &rv)); - - InitCachePrefs(); // From this point on, should be true appShell->SetQuitOnLastWindowClosing(PR_TRUE);