Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

To reduce confusion, read preferences.js for UNIX, prefs.js for Win/Mac, M3 bug #2343, approved dp

Browse Source
This commit is contained in:
hshaw%netscape.com 1999-03-16 17:59:11 +00:00
parent 53b3380a59
commit 4113a96d6e
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/libpref/src/nsPref.cpp
View File

@ -28,6 +28,10 @@
#include "nsIServiceManager.h" #include "nsIServiceManager.h"
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
#ifdef PREF_USE_SYSDIR
#include "nsSpecialSystemDirectory.h" // For exe dir
#endif /* PREF_USE_SYSDIR */
static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID); static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID);
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
@ -198,7 +202,19 @@ nsPref::useDefaultPrefFile(nsPref *aPrefInst)
if (!aPrefInst) if (!aPrefInst)
return; return;
#ifdef PREF_USE_SYSDIR
nsSpecialSystemDirectory sysDir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
sysDir += "prefs.js";
nsFilePath prefPath(sysDir);
/* incomplete */
#endif /* PREF_USE_SYSDIR */
#ifdef XP_UNIX
aPrefInst->Startup("preferences.js");
#else /* all others XP_WIN && XP_MAC */
aPrefInst->Startup("prefs.js"); aPrefInst->Startup("prefs.js");
#endif
return; return;
} }

4
modules/libpref/src/prefapi.c
View File

@ -957,7 +957,11 @@ pref_CompareStrings (const void *v1, const void *v2)
PR_IMPLEMENT(PRBool) PR_IMPLEMENT(PRBool)
pref_useDefaultPrefFile(void) pref_useDefaultPrefFile(void)
{ {
#ifdef XP_UNIX
return PREF_Init("preferences.js");
#else /* all others XP_WIN && XP_MAC */
return PREF_Init("prefs.js"); return PREF_Init("prefs.js");
#endif
} }

4
modules/libpref/src/prefapi.cpp
View File

@ -957,7 +957,11 @@ pref_CompareStrings (const void *v1, const void *v2)
PR_IMPLEMENT(PRBool) PR_IMPLEMENT(PRBool)
pref_useDefaultPrefFile(void) pref_useDefaultPrefFile(void)
{ {
#ifdef XP_UNIX
return PREF_Init("preferences.js");
#else /* all others XP_WIN && XP_MAC */
return PREF_Init("prefs.js"); return PREF_Init("prefs.js");
#endif
} }