Commit a86c0b43 authored by Carsten Schoenert's avatar Carsten Schoenert
Browse files

Rebuild patch queue from patch-queue branch

Modified patch:
debian-hacks/Add-another-preferences-directory-for-applications-p.patch

Resync patch content with version in the firefox package to prevent
later ignoring of LoadDirIntoArray while package build as this
modification within the patch was wrongly moved previously into an
'#ifdef/#endif' section which isn't active within the build.

Closes: #997841, #1003280
parent d6d6369c
......@@ -5,27 +5,26 @@ Subject: Add another preferences directory for applications:
This can be used to symlink to /etc/thunderbird/pref.
---
toolkit/xre/nsXREDirProvider.cpp | 3 +++
1 file changed, 3 insertions(+)
toolkit/xre/nsXREDirProvider.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index d6def8a..3fd4cfe 100644
index d6def8a..a4024d2 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -807,6 +807,8 @@ static nsresult DeleteDirIfExists(nsIFile* dir) {
static const char* const kAppendPrefDir[] = {"defaults", "preferences",
nullptr};
+static const char *const kAppendSysPrefDir[] = { "defaults", "syspref", nullptr };
+
#ifdef MOZ_BACKGROUNDTASKS
@@ -811,6 +811,7 @@ static const char* const kAppendPrefDir[] = {"defaults", "preferences",
static const char* const kAppendBackgroundTasksPrefDir[] = {
"defaults", "backgroundtasks", nullptr};
@@ -825,6 +827,7 @@ nsresult nsXREDirProvider::GetFilesInternal(const char* aProperty,
if (mozilla::BackgroundTasks::IsBackgroundTaskMode()) {
LoadDirIntoArray(mGREDir, kAppendBackgroundTasksPrefDir, directories);
#endif
+static const char *const kAppendSysPrefDir[] = { "defaults", "syspref", nullptr };
nsresult nsXREDirProvider::GetFilesInternal(const char* aProperty,
nsISimpleEnumerator** aResult) {
@@ -827,6 +828,7 @@ nsresult nsXREDirProvider::GetFilesInternal(const char* aProperty,
LoadDirIntoArray(mXULAppDir, kAppendBackgroundTasksPrefDir, directories);
+ LoadDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories);
}
#endif
+ LoadDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories);
rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
} else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment