804335 - Port 2012-10-22 Sync changes from mozilla-central

Status: RESOLVED FIXED

(SeaMonkey :: Sync UI, defect)

Description

[Jens Hatlak (:InvisibleSmiley)]

Many Sync changes just landed on mozilla-central. Looking at which changesets affected which files, we need to port parts from:

Bug 781946
http://hg.mozilla.org/mozilla-central/rev/7a7aff2f35d3

Bug 785225 parts 2, 3, 5, 7 and 8
http://hg.mozilla.org/mozilla-central/rev/bc3e055a34a1
http://hg.mozilla.org/mozilla-central/rev/79eba94e1758
http://hg.mozilla.org/mozilla-central/rev/7e5eb4b365ff
http://hg.mozilla.org/mozilla-central/rev/1c1410d01ab9
http://hg.mozilla.org/mozilla-central/rev/6d61599eebd3

Bug 787306
http://hg.mozilla.org/mozilla-central/rev/435e2bd35477

Bug 787273 parts 4 and 9
http://hg.mozilla.org/mozilla-central/rev/6117227b889d
http://hg.mozilla.org/mozilla-central/rev/ec93b64f28bb

Comment 1

[Jens Hatlak (:InvisibleSmiley)]

(In reply to Jens Hatlak (:InvisibleSmiley) from comment #0)
> http://hg.mozilla.org/mozilla-central/rev/1c1410d01ab9

Actually, part 7 doesn't need porting since we don't call SendCredentialsController() anywhere.

Comment 2

[Jens Hatlak (:InvisibleSmiley)]

Attachment: patch [Checkin: Comment 4]

Accepting review from whoever gets to this first (wink: trunk is broken). Should be simple since it's all just substitutions.

From bug 781946: s/changepph/change-passphrase/
From bug 785225 part 2 and bug 787306: s/Weave.Engines/Weave.Service.engineManager/
From bug 785225 part 3: s/Weave.ErrorHandler/Weave.Service.errorHandler/
From bug 785225 part 5: s/Weave.Clients/Weave.Service.clientsEngine/
From bug 785225 part 8: s/Weave.SyncScheduler/Weave.Service.scheduler/
From bug 787273 part 4: s/Weave.Identity/Weave.Service.identity/
From bug 787273 part 9: s/service.js/main.js/

Comment 3

[Ian Neal]

Comment on attachment 674273 [details] [diff] [review]
patch [Checkin: Comment 4]

Looks good to me

Comment 4

[Jens Hatlak (:InvisibleSmiley)]

Comment on attachment 674273 [details] [diff] [review]
patch [Checkin: Comment 4]

http://hg.mozilla.org/comm-central/rev/b34e0bc265fc

Comment 5

[Philip Chee]

> Actually, part 7 doesn't need porting since we don't call SendCredentialsController()
> anywhere.
Stupid question. Why don't we call SendCredentialsController() like Firefox?

Comment 6

[Jens Hatlak (:InvisibleSmiley)]

See comment 1 of bug 675823 which we didn't port.