Bug #256190 --> thunderbird.js preferences getting loaded before mailnews.js. Rename thunderbird.js to all-thunderbird.js

to ensure that it gets loaded last since it has the final overrides for thunderbird.
This commit is contained in:
scott%scott-macgregor.org 2004-08-19 20:18:04 +00:00
parent 1d21588048
commit 11d14c549d
3 changed files with 3 additions and 2 deletions

View File

@ -47,7 +47,7 @@ DEFINES += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\"
DIRS = profile
PREF_JS_EXPORTS = \
$(srcdir)/profile/thunderbird.js \
$(srcdir)/profile/all-thunderbird.js \
$(NULL)
ifeq ($(USE_SHORT_LIBNAME), 1)
@ -248,7 +248,7 @@ install:: thunderbird
$(SYSINSTALL) $< $(DESTDIR)$(bindir)
GARBAGE += thunderbird
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js thunderbird.js mailnews.js)
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js mailnews.js)
endif
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))

View File

@ -635,6 +635,7 @@ function upgradeCleanup()
deleteThisFile("Program", "defaults/pref/security-prefs.js");
deleteThisFile("Program", "defaults/pref/winpref.js");
deleteThisFile("Program", "defaults/pref/xpinstall.js");
deleteThisFile("Program", "defaults/pref/thunderbird.js");
}
// main