1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From: Mike Hommey <glandium@debian.org>
Date: Sat, 21 Jun 2008 03:09:21 +0200
Subject: Add another preferences directory for applications:
preferences/syspref
It was existing in previous versions of iceweasel as a symlink to
/etc/iceweasel/pref.
This has the side effect to make these preferences there work again, and
to disable the "set as default browser" dialog.
---
toolkit/xre/nsXREDirProvider.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 45bdfb1..da71bdd 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -603,6 +603,7 @@ nsXREDirProvider::LoadAppBundleDirs()
}
static const char *const kAppendPrefDir[] = { "defaults", "preferences", nsnull };
+static const char *const kAppendSysPrefDir[] = { "defaults", "syspref", nsnull };
#ifdef DEBUG_bsmedberg
static void
@@ -644,6 +645,7 @@ nsXREDirProvider::GetFilesInternal(const char* aProperty,
LoadAppDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
LoadDirsIntoArray(mAppBundleDirectories,
kAppendPrefDir, directories);
+ LoadAppDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories);
rv = NS_NewArrayEnumerator(aResult, directories);
}
|