From 5767257f3d033e280733be493ca160a7b35b89af Mon Sep 17 00:00:00 2001 From: asac Date: Wed, 21 Feb 2007 03:34:15 +0100 Subject: [PATCH] add a recognized pref folder called 'syspref' inside the defaults/ hierarchy. --- modules/libpref/src/nsPrefService.cpp | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp index 0c9e125..6506794 100644 --- a/modules/libpref/src/nsPrefService.cpp +++ b/modules/libpref/src/nsPrefService.cpp @@ -758,6 +758,21 @@ static nsresult pref_InitInitialObjects() NS_WARNING("Error parsing application default preferences."); } + // Load files from defaults/syspref + nsCOMPtr SysPrefDir; + rv = defaultPrefDir->GetParent(getter_AddRefs(SysPrefDir)); + NS_ENSURE_SUCCESS(rv, rv); + rv = SysPrefDir->AppendNative(NS_LITERAL_CSTRING("syspref")); + NS_ENSURE_SUCCESS(rv, rv); + PRBool exists; + if (NS_SUCCEEDED(SysPrefDir->Exists(&exists)) && exists) { + rv = pref_LoadPrefsInDir(SysPrefDir, nsnull, 0); + if (NS_FAILED(rv)) { + NS_WARNING("Error parsing system default preferences."); + } + + } + // xxxbsmedberg: TODO load default prefs from a category // but the architecture is not quite there yet -- 1.4.4.4