From: Mike Hommey <glandium@debian.org>
Date: Sat, 21 Jun 2008 01:09:21 +0000 (+0200)
Subject: Add another preferences directory for applications: preferences/syspref
X-Git-Tag: archive/raspbian/128.11.0esr-1+rpi1~2^2^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c79061ee5375a488fca25f8c19737678ce86fe4e;p=firefox-esr.git

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.

Gbp-Pq: Topic debian-hacks
Gbp-Pq: Name Add-another-preferences-directory-for-applications-p.patch
---

diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index d3af49b495b..3040e94b88c 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -685,6 +685,7 @@ static const char* const kAppendPrefDir[] = {"defaults", "preferences",
 static const char* const kAppendBackgroundTasksPrefDir[] = {
     "defaults", "backgroundtasks", nullptr};
 #endif
+static const char *const kAppendSysPrefDir[] = { "defaults", "syspref", nullptr };
 
 NS_IMETHODIMP
 nsXREDirProvider::GetFiles(const char* aProperty,
@@ -702,6 +703,7 @@ nsXREDirProvider::GetFiles(const char* aProperty,
       LoadDirIntoArray(mXULAppDir, kAppendBackgroundTasksPrefDir, directories);
     }
 #endif
+    LoadDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories);
 
     rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
   } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {