5
5
Index: mozilla/mozilla/toolkit/xre/nsXREDirProvider.cpp
6
6
===================================================================
7
--- mozilla.orig/mozilla/toolkit/xre/nsXREDirProvider.cpp 2011-09-29 00:59:39.000000000 +0100
8
+++ mozilla/mozilla/toolkit/xre/nsXREDirProvider.cpp 2011-09-29 10:22:10.700227676 +0100
7
--- mozilla.orig/mozilla/toolkit/xre/nsXREDirProvider.cpp 2012-04-18 03:11:27.000000000 +0100
8
+++ mozilla/mozilla/toolkit/xre/nsXREDirProvider.cpp 2012-04-18 10:45:26.885434464 +0100
12
12
static const char *const kAppendPrefDir[] = { "defaults", "preferences", nsnull };
15
15
#ifdef DEBUG_bsmedberg
18
LoadAppDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
18
LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
19
19
LoadDirsIntoArray(mAppBundleDirectories,
20
20
kAppendPrefDir, directories);
21
+ LoadAppDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories);
21
+ LoadDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories);
22
22
+ LoadDirsIntoArray(mAppBundleDirectories,
23
23
+ kAppendSysPrefDir, directories);
25
rv = NS_NewArrayEnumerator(aResult, directories);
25
// Include the WebappRT-specific prefs dir if we're running WebappRT.
26
if (gAppData && !strcmp(gAppData->ID, WEBAPPRT_APPID)) {
27
27
Index: mozilla/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h
28
28
===================================================================
29
--- mozilla.orig/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h 2011-09-29 00:59:46.000000000 +0100
30
+++ mozilla/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h 2011-09-29 10:22:10.700227676 +0100
29
--- mozilla.orig/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h 2012-04-18 03:11:43.000000000 +0100
30
+++ mozilla/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h 2012-04-18 10:43:24.269436643 +0100
33
33
#define NS_APP_DEFAULTS_50_DIR "DefRt" // The root dir of all defaults dirs
38
38
#define NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR "ProfDefNoLoc" // The profile defaults of the "default"
39
39
Index: mozilla/mozilla/xpcom/io/nsAppFileLocationProvider.cpp
40
40
===================================================================
41
--- mozilla.orig/mozilla/xpcom/io/nsAppFileLocationProvider.cpp 2011-09-29 00:59:46.000000000 +0100
42
+++ mozilla/mozilla/xpcom/io/nsAppFileLocationProvider.cpp 2011-09-29 10:22:10.700227676 +0100
41
--- mozilla.orig/mozilla/xpcom/io/nsAppFileLocationProvider.cpp 2012-04-18 03:11:43.000000000 +0100
42
+++ mozilla/mozilla/xpcom/io/nsAppFileLocationProvider.cpp 2012-04-18 10:43:24.269436643 +0100
45
45
#define DEFAULTS_DIR_NAME NS_LITERAL_CSTRING("defaults")
67
67
Index: mozilla/mozilla/modules/libpref/src/Preferences.cpp
68
68
===================================================================
69
--- mozilla.orig/mozilla/modules/libpref/src/Preferences.cpp 2011-09-29 10:22:28.616227359 +0100
70
+++ mozilla/mozilla/modules/libpref/src/Preferences.cpp 2011-09-29 10:26:43.716222825 +0100
71
@@ -1093,6 +1093,15 @@
69
--- mozilla.orig/mozilla/modules/libpref/src/Preferences.cpp 2012-04-18 03:09:13.000000000 +0100
70
+++ mozilla/mozilla/modules/libpref/src/Preferences.cpp 2012-04-18 10:43:24.269436643 +0100
71
@@ -1122,6 +1122,15 @@
73
73
NS_WARNING("Error parsing application default preferences.");
82
82
+ NS_WARNING("Error parsing application system preferences.");
84
84
// Load jar:$app/omni.jar!/defaults/preferences/*.js
85
nsZipArchive *appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
85
nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
86
86
if (appJarReader) {