1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch b/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch
new file mode 100644
index 0000000000..93b500067e
--- /dev/null
+++ b/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch
@@ -0,0 +1,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 d9bcdb1..9b044f6 100644
+--- a/toolkit/xre/nsXREDirProvider.cpp
++++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -850,6 +850,7 @@ static nsresult DeleteDirIfExists(nsIFile* dir) {
+ 
+ static const char* const kAppendPrefDir[] = {"defaults", "preferences",
+                                              nullptr};
++static const char *const kAppendSysPrefDir[] = { "defaults", "syspref", nullptr };
+ 
+ nsresult nsXREDirProvider::GetFilesInternal(const char* aProperty,
+                                             nsISimpleEnumerator** aResult) {
+@@ -860,6 +861,7 @@ nsresult nsXREDirProvider::GetFilesInternal(const char* aProperty,
+     nsCOMArray<nsIFile> directories;
+ 
+     LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
++    LoadDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories);
+ 
+     rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
+   } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {