nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset ddd79f809784

Browse source
This commit is contained in:
Dão Gottwald 2009-10-04 12:44:27 +02:00
parent f1297fc664
commit bdf29ceb01
6 changed files with 16 additions and 23 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
browser/installer/package-manifest.in
View file

@ -363,7 +363,9 @@
@BINPATH@/@PREF_DIR@/firefox.js @BINPATH@/@PREF_DIR@/firefox.js
@BINPATH@/@PREF_DIR@/firefox-branding.js @BINPATH@/@PREF_DIR@/firefox-branding.js
@BINPATH@/@PREF_DIR@/channel-prefs.js @BINPATH@/@PREF_DIR@/channel-prefs.js
@BINPATH@/greprefs.js @BINPATH@/greprefs/all.js
@BINPATH@/greprefs/security-prefs.js
@BINPATH@/greprefs/xpinstall.js
@BINPATH@/defaults/autoconfig/platform.js @BINPATH@/defaults/autoconfig/platform.js
@BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/defaults/autoconfig/prefcalls.js

5
browser/installer/removed-files.in
View file

@ -780,9 +780,6 @@ components/xuldoc.xpt
components/xultmpl.xpt components/xultmpl.xpt
components/zipwriter.xpt components/zipwriter.xpt
components/firefox.xpt components/firefox.xpt
greprefs/all.js
greprefs/security-prefs.js
greprefs/xpinstall.js
run-mozilla.sh run-mozilla.sh
firefox firefox
dependentlibs.list dependentlibs.list
@ -813,4 +810,4 @@ install.rdf
@DLL_PREFIX@jsj@DLL_SUFFIX@ @DLL_PREFIX@jsj@DLL_SUFFIX@
#ifdef XP_WIN #ifdef XP_WIN
components/brwsrcmp.dll components/brwsrcmp.dll
#endif #endif

15
modules/libpref/src/Makefile.in
View file

@ -72,6 +72,8 @@ ifdef WINCE
DEFINES += -DWINCE=1 DEFINES += -DWINCE=1
endif endif
PREF_JS_EXPORTS = $(srcdir)/init/all.js
EXTRA_DSO_LDOPTS = \ EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \ $(LIBS_DIR) \
$(MOZ_COMPONENT_LIBS) \ $(MOZ_COMPONENT_LIBS) \
@ -80,13 +82,9 @@ EXTRA_DSO_LDOPTS = \
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \
mailnews.js editor.js \ all.js mailnews.js editor.js \
aix.js beos.js unix.js winpref.js os2prefs.js openvms.js photon.js) aix.js beos.js unix.js winpref.js os2prefs.js openvms.js photon.js)
GARBAGE += greprefs.js
GREPREF_FILES = $(topsrcdir)/xpinstall/public/xpinstall.js $(topsrcdir)/netwerk/base/public/security-prefs.js $(srcdir)/init/all.js
# Optimizer bug with GCC 3.2.2 on OS/2 # Optimizer bug with GCC 3.2.2 on OS/2
ifeq ($(OS_ARCH), OS2) ifeq ($(OS_ARCH), OS2)
nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
@ -94,10 +92,3 @@ nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
@$(MAKE_DEPS_AUTO_CXX) @$(MAKE_DEPS_AUTO_CXX)
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS:-O2=-O1) $(_VPATH_SRCS) $(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS:-O2=-O1) $(_VPATH_SRCS)
endif endif
greprefs.js: $(GREPREF_FILES)
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ > $@
libs:: greprefs.js
$(INSTALL) $^ $(DIST)/bin/

11
modules/libpref/src/nsPrefService.cpp
View file

@ -464,8 +464,8 @@ static nsresult openPrefFile(nsIFile* aFile)
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
PRUint32 fileSize; PRInt64 fileSize;
rv = inStr->Available(&fileSize); rv = aFile->GetFileSize(&fileSize);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -640,19 +640,18 @@ static nsresult pref_LoadPrefsInDirList(const char *listId)
static nsresult pref_InitInitialObjects() static nsresult pref_InitInitialObjects()
{ {
nsCOMPtr<nsIFile> aFile; nsCOMPtr<nsIFile> aFile;
nsCOMPtr<nsIFile> greprefsFile;
nsCOMPtr<nsIFile> defaultPrefDir; nsCOMPtr<nsIFile> defaultPrefDir;
nsresult rv; nsresult rv;
// first we parse the GRE default prefs. This also works if we're not using a GRE, // first we parse the GRE default prefs. This also works if we're not using a GRE,
rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greprefsFile)); rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(defaultPrefDir));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("greprefs.js")); rv = defaultPrefDir->AppendNative(NS_LITERAL_CSTRING("greprefs"));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
rv = openPrefFile(greprefsFile); rv = pref_LoadPrefsInDir(defaultPrefDir, nsnull, 0);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
NS_WARNING("Error parsing GRE default preferences. Is this an old-style embedding app?"); NS_WARNING("Error parsing GRE default preferences. Is this an old-style embedding app?");
} }

2
netwerk/base/public/Makefile.in
View file

@ -146,6 +146,8 @@ EXPORTS = \
nsASocketHandler.h \ nsASocketHandler.h \
$(NULL) $(NULL)
PREF_JS_EXPORTS = $(srcdir)/security-prefs.js
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET DEFINES += -DIMPL_NS_NET

2
xpinstall/public/Makefile.in
View file

@ -62,4 +62,6 @@ EXPORTS = \
nsSoftwareUpdateIIDs.h \ nsSoftwareUpdateIIDs.h \
$(NULL) $(NULL)
PREF_JS_EXPORTS = $(srcdir)/xpinstall.js
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk