1From 4a71d4e6d6a1272c5581ffab97c82f5f2dc063bd Mon Sep 17 00:00:00 2001
2From: Mike Hommey <glandium@debian.org>
3Date: Sat, 21 Jun 2008 03:09:21 +0200
4Subject: [PATCH] Add another preferences directory for applications:
5 preferences/syspref
6
7It was existing in previous versions of iceweasel as a symlink to
8/etc/iceweasel/pref.
9
10This has the side effect to make these preferences there work again, and
11to disable the "set as default browser" dialog.
12
13---
14 toolkit/xre/nsXREDirProvider.cpp | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
18index 4fd58c7585..c065b6fdc9 100644
19--- a/toolkit/xre/nsXREDirProvider.cpp
20+++ b/toolkit/xre/nsXREDirProvider.cpp
21@@ -848,6 +848,7 @@ static nsresult DeleteDirIfExists(nsIFile* dir) {
22
23 static const char* const kAppendPrefDir[] = {"defaults", "preferences",
24                                              nullptr};
25+static const char *const kAppendSysPrefDir[] = { "defaults", "syspref", nullptr };
26
27 #ifdef DEBUG_bsmedberg
28 static void DumpFileArray(const char* key, nsCOMArray<nsIFile> dirs) {
29@@ -879,6 +880,7 @@ nsresult nsXREDirProvider::GetFilesInternal(const char* aProperty,
30
31     LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
32     LoadDirsIntoArray(mAppBundleDirectories, kAppendPrefDir, directories);
33+    LoadDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories);
34
35     rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
36   } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
37