From d7b5d09fd78abfd6e7264c916e18a4d91d4b2324 Mon Sep 17 00:00:00 2001 From: "hshaw%netscape.com" Date: Tue, 16 Mar 1999 18:31:40 +0000 Subject: [PATCH] To reduce confusion, read 'Netscape Preferences' for Mac, M3 bug #2343, approved dp --- modules/libpref/src/nsPref.cpp | 6 ++++-- modules/libpref/src/prefapi.c | 6 ++++-- modules/libpref/src/prefapi.cpp | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/libpref/src/nsPref.cpp b/modules/libpref/src/nsPref.cpp index 5553dba8cbe..4326caa608e 100644 --- a/modules/libpref/src/nsPref.cpp +++ b/modules/libpref/src/nsPref.cpp @@ -210,9 +210,11 @@ nsPref::useDefaultPrefFile(nsPref *aPrefInst) #endif /* PREF_USE_SYSDIR */ -#ifdef XP_UNIX +#if defined(XP_UNIX) aPrefInst->Startup("preferences.js"); -#else /* all others XP_WIN && XP_MAC */ +#elif defined(XP_MAC) + aPrefInst->Startup("Netscape Preferences"); +#else /* XP_WIN */ aPrefInst->Startup("prefs.js"); #endif diff --git a/modules/libpref/src/prefapi.c b/modules/libpref/src/prefapi.c index 066e97cd5d8..bcd1b2b48c3 100644 --- a/modules/libpref/src/prefapi.c +++ b/modules/libpref/src/prefapi.c @@ -957,9 +957,11 @@ pref_CompareStrings (const void *v1, const void *v2) PR_IMPLEMENT(PRBool) pref_useDefaultPrefFile(void) { -#ifdef XP_UNIX +#if defined(XP_UNIX) return PREF_Init("preferences.js"); -#else /* all others XP_WIN && XP_MAC */ +#elif defined(XP_MAC) + return PREF_Init("Netscape Preferences"); +#else /* XP_WIN */ return PREF_Init("prefs.js"); #endif } diff --git a/modules/libpref/src/prefapi.cpp b/modules/libpref/src/prefapi.cpp index 066e97cd5d8..bcd1b2b48c3 100644 --- a/modules/libpref/src/prefapi.cpp +++ b/modules/libpref/src/prefapi.cpp @@ -957,9 +957,11 @@ pref_CompareStrings (const void *v1, const void *v2) PR_IMPLEMENT(PRBool) pref_useDefaultPrefFile(void) { -#ifdef XP_UNIX +#if defined(XP_UNIX) return PREF_Init("preferences.js"); -#else /* all others XP_WIN && XP_MAC */ +#elif defined(XP_MAC) + return PREF_Init("Netscape Preferences"); +#else /* XP_WIN */ return PREF_Init("prefs.js"); #endif }