19 libs:: greprefs.js |
19 libs:: greprefs.js |
20 $(INSTALL) $^ $(DIST)/bin/ |
20 $(INSTALL) $^ $(DIST)/bin/ |
21 diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp |
21 diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp |
22 --- a/modules/libpref/src/nsPrefService.cpp |
22 --- a/modules/libpref/src/nsPrefService.cpp |
23 +++ b/modules/libpref/src/nsPrefService.cpp |
23 +++ b/modules/libpref/src/nsPrefService.cpp |
24 @@ -57,16 +57,17 @@ |
24 @@ -55,16 +55,17 @@ |
|
25 #include "nsIStringEnumerator.h" |
25 #include "nsIZipReader.h" |
26 #include "nsIZipReader.h" |
26 #include "nsPrefBranch.h" |
27 #include "nsPrefBranch.h" |
27 #include "nsXPIDLString.h" |
28 #include "nsXPIDLString.h" |
28 #include "nsCRT.h" |
29 #include "nsCRT.h" |
29 #include "nsCOMArray.h" |
30 #include "nsCOMArray.h" |
30 #include "nsXPCOMCID.h" |
31 #include "nsXPCOMCID.h" |
31 #include "nsAutoPtr.h" |
32 #include "nsAutoPtr.h" |
32 #include "nsThreadUtils.h" |
|
33 +#include "nsKDEUtils.h" |
33 +#include "nsKDEUtils.h" |
34 |
34 |
35 #include "nsQuickSort.h" |
35 #include "nsQuickSort.h" |
36 #include "prmem.h" |
36 #include "prmem.h" |
37 #include "pldhash.h" |
37 #include "pldhash.h" |
38 |
38 |
39 #include "prefapi.h" |
39 #include "prefapi.h" |
40 #include "prefread.h" |
40 #include "prefread.h" |
41 #include "prefapi_private_data.h" |
41 #include "prefapi_private_data.h" |
42 @@ -798,30 +799,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
42 @@ -772,30 +773,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
43 } |
43 } |
44 |
44 |
45 static nsresult pref_LoadPrefsInDirList(const char *listId) |
45 static nsresult pref_LoadPrefsInDirList(const char *listId) |
46 { |
46 { |
47 nsresult rv; |
47 nsresult rv; |
87 } |
87 } |
88 return NS_OK; |
88 return NS_OK; |
89 } |
89 } |
90 |
90 |
91 //---------------------------------------------------------------------------------------- |
91 //---------------------------------------------------------------------------------------- |
92 @@ -852,28 +871,40 @@ static nsresult pref_InitDefaults() |
92 @@ -826,28 +845,40 @@ static nsresult pref_InitDefaults() |
93 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
93 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
94 static const char* specialFiles[] = { |
94 static const char* specialFiles[] = { |
95 #if defined(XP_MAC) || defined(XP_MACOSX) |
95 #if defined(XP_MAC) || defined(XP_MACOSX) |
96 "macprefs.js" |
96 "macprefs.js" |
97 #elif defined(XP_WIN) |
97 #elif defined(XP_WIN) |