Closed Bug 325248 (b181) Opened 19 years ago Closed 19 years ago

Review browser/toolkit trunk-1.8 branch diff and add ifdefs as needed

Categories

(Firefox :: General, defect, P3)

Product:
Firefox
Component:
General
Type:
defect

Tracking

()

Status:
RESOLVED INVALID
Milestone:
Firefox 2

People

(Reporter: Gavin, Assigned: Gavin)

References

Details

Attachments

(4 files)

bug 314700 [checked in]
3.85 KB, patch
mconnor
: review+
mconnor
: approval-branch-1.8.1+
Details | Diff | Splinter Review
bug 318193 [checked in]
887 bytes, patch
mconnor
: review+
Details | Diff | Splinter Review
bug 23485 [checked in]
1.31 KB, patch
mconnor
: review+
mconnor
: approval-branch-1.8.1+
Details | Diff | Splinter Review
bug 253481 [checked in]
2.38 KB, patch
mconnor
: review+
mconnor
: approval-branch-1.8.1+
Details | Diff | Splinter Review
The browser/ and toolkit/ directories from the 1.8 branch and trunk are going to be synced, this bug tracks reviewing diff to ensure that changes that rely on non-synced core changes are appropriately ifdeffed (#if[n]def MOZILLA_1_8_BRANCH).
bug 314700 depends on bug 314427 which won't make the branch.
Status: NEW → ASSIGNED
Comment on attachment 210169 [details] [diff] [review] bug 314700 [checked in] >Index: browser/base/content/browser.js >+#ifndef MOZILLA_1_8_BRANCH >+# bug 314700 > var name = aEvent.target.getAttribute("popupWindowName"); >- >+#endif I've changed this locally to not remove the extra line. >Index: toolkit/content/widgets/browser.xml >+#ifdef MOZILLA_1_8_BRANCH and added the bug number here as with the others. Will land the equivalent on the branch as well.
Attachment #210169 - Flags: review?(mconnor)
Attachment #210169 - Flags: review?(mconnor) → review+
Attachment #210169 - Flags: branch-1.8.1+
Comment on attachment 210169 [details] [diff] [review] bug 314700 [checked in] Landed this on branch/trunk. mozilla/browser/base/content/browser.js; 1.558; mozilla/toolkit/content/widgets/browser.xml; 1.83; mozilla/browser/base/content/browser.js; 1.479.2.53; mozilla/toolkit/content/widgets/browser.xml; 1.70.2.5;
Attachment #210169 - Attachment description: bug 314700 → bug 314700 [checked in]
Attachment #212816 - Flags: review?(mconnor)
Alias: b181
Attachment #212841 - Flags: review?(mconnor)
Attachment #212844 - Flags: review?(mconnor)
Priority: -- → P1
Attachment #212816 - Flags: review?(mconnor) → review+
Attachment #212841 - Flags: review?(mconnor)
Attachment #212841 - Flags: review+
Attachment #212841 - Flags: approval-branch-1.8.1+
Attachment #212844 - Flags: review?(mconnor)
Attachment #212844 - Flags: review+
Attachment #212844 - Flags: approval-branch-1.8.1+
Comment on attachment 212841 [details] [diff] [review] bug 23485 [checked in] mozilla/browser/base/content/browser.xul 1.288 mozilla/browser/base/content/browser.xul 1.268.2.23
Attachment #212841 - Attachment description: bug 23485 → bug 23485 [checked in]
Comment on attachment 212816 [details] [diff] [review] bug 318193 [checked in] mozilla/browser/base/content/browser.js 1.479.2.91 mozilla/browser/base/content/browser.js 1.587
Attachment #212816 - Attachment description: bug 318193 → bug 318193 [checked in]
Comment on attachment 212844 [details] [diff] [review] bug 253481 [checked in] mozilla/toolkit/content/widgets/textbox.xml 1.29 mozilla/toolkit/content/widgets/textbox.xml 1.21.4.4
Attachment #212844 - Attachment description: bug 253481 → bug 253481 [checked in]
Priority: P1 → P3
Target Milestone: --- → Firefox 2
This is invalid now - automatic syncing isn't going to happen.
Status: ASSIGNED → RESOLVED
Closed: 19 years ago
Resolution: --- → INVALID
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: