We need to move the current state of trunk to the 1.8.0 branch excluding any trunk-only code that exists.

Applying this to the current trunk code makes the code work on the 1.8.0 branch

Sync'ed on 1_8_0

Not sure if this is a big deal, but this checkin caused the following test failures on the 1.8.0 branch fireball machine (OSX): Running regxpcom test ... Timeout = 120 seconds. Begin: Thu Apr 6 03:03:02 2006 cmd = /builds/tinderbox/Tb-Mozilla1.8.0/Darwin_7.9.0_Depend/mozilla//dist/Thunderbird.app/Contents/MacOS/thunderbird-bin -register End: Thu Apr 6 03:03:06 2006 ----------- Output from regxpcom ------------- ----------- End Output from regxpcom --------- regxpcom: test failed Found profile. Creating clean profile ... Deleting /Users/cltbld/Library/Thunderbird/Profiles/4yowrzv5.default ... Begin: Thu Apr 6 03:03:07 2006 cmd = /builds/tinderbox/Tb-Mozilla1.8.0/Darwin_7.9.0_Depend/mozilla//dist/Thunderbird.app/Contents/MacOS/thunderbird-bin -CreateProfile default End: Thu Apr 6 03:03:08 2006 ----------- Output from Profile Creation ------------- Success: created profile 'default' ----------- End Output from Profile Creation --------- profile dir = /Users/cltbld/Library/Thunderbird/Profiles/4yowrzv5.default prefs.js = /Users/cltbld/Library/Thunderbird/Profiles/4yowrzv5.default/prefs.js Setting general.skins.selectedSkin to modern/1.0 Running MozillaAliveTest test ... Timeout = 45 seconds. Begin: Thu Apr 6 03:03:08 2006 cmd = /builds/tinderbox/Tb-Mozilla1.8.0/Darwin_7.9.0_Depend/mozilla//dist/Thunderbird.app/Contents/MacOS/thunderbird-bin -P default End: Thu Apr 6 03:03:11 2006 ----------- Output from MozillaAliveTest ------------- CFMessagePortCreateLocal failed (name = Processes-0.360841217 error = 0) ----------- End Output from MozillaAliveTest --------- Error: thunderbird-bin: exited with status 16777215 Error: thunderbird-bin: dumped core. MozillaAliveTest: test failed

(In reply to comment #4) > Not sure if this is a big deal, but this checkin caused the following test > failures on the 1.8.0 branch fireball machine (OSX): I know. I wrote a note on it on the time of checkin. I just cannot grasp why it does it. It's extensions/xforms only, and it's the tb-build failing...

(In reply to comment #6) > Created an attachment (id=217546) [edit] > Patch for 1.8 branch Also includes bug 332960

(In reply to comment #5) > (In reply to comment #4) > > Not sure if this is a big deal, but this checkin caused the following test > > failures on the 1.8.0 branch fireball machine (OSX): > > I know. I wrote a note on it on the time of checkin. I just cannot grasp why it > does it. It's extensions/xforms only, and it's the tb-build failing... Aparently fireball was having a bad day, that was all.

(In reply to comment #6) > Created an attachment (id=217546) [edit] > Patch for 1.8 branch Checked in on 1_8

This syncs: bug 329633 bug 307421 bug 310138 bug 312687 bug 316616 bug 320081 bug 323683 bug 323829 bug 323845 bug 323850 bug 324079 bug 324096 bug 326062 bug 326766 bug 327131 bug 327234 bug 327998 bug 328344 bug 328393 bug 328873 bug 329510 bug 329885 bug 315767 bug 330579 bug 330252 bug 327985 bug 329204 bug 323006 bug 329379 bug 331328 bug 330671 bug 300255 bug 329479 bug 328150 bug 310276 bug 331469 bug 328585 bug 326452 bug 329520 bug 331961 bug 282828 bug 293571 bug 305060 bug 327041 bug 332072 bug 310122 bug 332209 bug 332215 bug 327305 bug 323851 bug 305184 bug 332129 bug 332559 bug 323849 bug 328092 bug 331081 bug 330825 bug 332125 bug 329136 bug 305196 bug 332127 bug 332218 bug 331911 bug 332960

Here's the perl script that I used to remove "xf-to-branch" from the status whiteboard on all the bugs.