367091 - Change xpfe SeaMonkey's browser-prefs usage to suite/browser

Status: RESOLVED WONTFIX

(SeaMonkey :: General, defect)

Description

[Mark Banner (:standard8)]

Some time ago, for the suiterunner implementation we forked the browser-prefs.js file for suiterunner into suite/browser from xpfe/bootstrap.

This has given us two versions of prefs which causes confusion/missed updates (bug 358764 and others I believe).

How about we drop the xpfe/bootstrap version and just use the suite/browser one for both versions of SeaMonkey? With the current state/progress of suiterunner, I still think its going to be a couple of months before we switch on trunk, it shouldn't take too long to remerge, so I think it may be worth it.

Comment 1

[Robert Kaiser]

IIRC, one reason why we did this was that we wanted to avoid lots of ifdefs in the file.
So our choice seems to be to re-introduce some amount of ifdefs or diff the two files once in a while and sync changes that should have been missed in one of them.

Comment 2

[Mark Banner (:standard8)]

(In reply to comment #1)
> IIRC, one reason why we did this was that we wanted to avoid lots of ifdefs in
> the file.
> So our choice seems to be to re-introduce some amount of ifdefs or diff the two
> files once in a while and sync changes that should have been missed in one of
> them.

I'd forgotten about that. Ok, let's resync them occassionally - really we probably only need to think about this before suiterunner becomes trunk. Once it's trunk folks shouldn't be updating the xpfe version for SeaMonkey changes.