mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-15 13:09:14 +00:00
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:
parent
1d21588048
commit
11d14c549d
@ -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)))
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user