Closed
Bug 635665
Opened 13 years ago
Closed 13 years ago
nsPrefBranch::GetComplexValue code incorrect after e10s merge
Categories
(Core :: Preferences: Backend, defect)
Core
Preferences: Backend
Tracking
()
RESOLVED
FIXED
Tracking | Status | |
---|---|---|
blocking2.0 | --- | - |
People
(Reporter: neil, Assigned: jag+mozilla)
References
Details
Attachments
(1 file)
1.99 KB,
patch
|
dwitte
:
review+
beltzner
:
approval2.0+
|
Details | Diff | Splinter Review |
The patch for bug 564048 landed in changeset 2f382be70ce7. The patch for bug 568271 landed in changeset ee0c3deb3ac4. However the merge changeset 155d97b3f8c9 mismerged the changes.
Assignee | ||
Comment 1•13 years ago
|
||
As far as I could tell this is the only change lost in nsPrefBranch.cpp
Comment 2•13 years ago
|
||
This needs a reviewer, right?
Assignee | ||
Comment 3•13 years ago
|
||
Comment on attachment 513976 [details] [diff] [review] Remove duplicated code, re-do related change. Yeah, asking the author of the original code (/me waves)
Attachment #513976 -
Flags: review?(dwitte)
Reporter | ||
Updated•13 years ago
|
Assignee: nobody → jag-mozilla
Comment 4•13 years ago
|
||
Comment on attachment 513976 [details] [diff] [review] Remove duplicated code, re-do related change. Thanks! r=dwitte.
Attachment #513976 -
Flags: review?(dwitte) → review+
Assignee | ||
Comment 5•13 years ago
|
||
Comment on attachment 513976 [details] [diff] [review] Remove duplicated code, re-do related change. This restores a previous change that was accidentally backed out as part of a merge. Specifically, this removes duplicated code (see the code above it) which currently makes us call e.g. GetDefaultFromPropertiesFile(...) twice.
Attachment #513976 -
Flags: approval2.0?
Updated•13 years ago
|
Attachment #513976 -
Flags: approval2.0? → approval2.0+
Comment 7•13 years ago
|
||
Ready for checkin, if someone can get this that'd be great. :)
Keywords: checkin-needed
pushed to mozilla-central http://hg.mozilla.org/mozilla-central/rev/6aaffde24c3b
Keywords: checkin-needed
Assignee | ||
Comment 9•13 years ago
|
||
Thanks Josh.
Status: NEW → RESOLVED
Closed: 13 years ago
Resolution: --- → FIXED
You need to log in
before you can comment on or make changes to this bug.
Description
•