Closed Bug 738810 Opened 12 years ago Closed 12 years ago

convert mailnews/base/prefs/content/AccountManager.js to Services.jsm and MailServices.js (and fix strict Javascript warnings)

Categories

(MailNews Core :: Account Manager, defect)

defect
Not set
minor

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird 15.0

People

(Reporter: aceman, Assigned: aceman)

References

(Blocks 1 open bug)

Details

Attachments

(1 file, 3 obsolete files)

Convert mailnews/base/prefs/content/AccountManager.js to Services.jsm and MailServices.js .

Also update some comments due to landing of IM in
http://hg.mozilla.org/comm-central/rev/8cdfed92867f

Also fix some new strict Javacript warnings:
Timestamp: 23.03.2012 22:23:22
Warning: function onAccountTreeSelect does not always return a value
Source File: chrome://messenger/content/AccountManager.js
Line: 678, Column: 4
Source Code:
    return; 

Timestamp: 23.03.2012 22:23:22
Warning: package is a reserved identifier
Source File: chrome://messenger/content/AccountManager.js
Line: 747, Column: 8
Source Code:
    var package = pageId.split("am-")[1].split(".xul")[0]; 

Timestamp: 23.03.2012 22:23:22
Warning: redefining package is deprecated
Source File: chrome://messenger/content/AccountManager.js
Line: 747, Column: 8
Source Code:
    var package = pageId.split("am-")[1].split(".xul")[0]; 

Timestamp: 23.03.2012 22:23:22
Warning: function getPageFormElements does not always return a value
Source File: chrome://messenger/content/AccountManager.js
Line: 1042

Timestamp: 23.03.2012 22:32:48
Warning: assignment to undeclared variable panel
Source File: chrome://messenger/content/AccountManager.js
Line: 1191

(Depending on bugs that must land first to not make colliding patches.)
Depends on: 739573, 740617
Warning: ReferenceError: reference to undefined property node._account
Source file: chrome://messenger/content/AccountManager.js
Line: 735

When clicking on the SMTP server in the tree.
Blocks: 749200
To save anybody else the work, I have a patch ready for this, but must wait for bug 739573 to land because they would collide.
Summary: convert mailnews/base/prefs/content/AccountManager.js to Services.jsm and MailServices.js → convert mailnews/base/prefs/content/AccountManager.js to Services.jsm and MailServices.js (and fix strict Javascript warnings)
Attached patch patch (obsolete) — Splinter Review
Attachment #623424 - Flags: review?(iann_bugzilla)
Status: NEW → ASSIGNED
For reviewers: patch to be applied on top of patch in bug 739573.
Comment on attachment 623424 [details] [diff] [review]
patch

Been running with the patch for a number of days and no issues.
On code inspection...
>+++ b/mailnews/base/prefs/content/am-prefs.js
> function getAccountValueIsLocked(element)
> {
>+  let prefstr = "";
>+  let preftype;
Just define these two within the if statement.
>+  let prefval;
Not used.
> 
>+  let prefstring = element.getAttribute("prefstring");
>   if (prefstring) {
>+    preftype = element.getAttribute("preftype");
>     prefstr = substPrefTokens(prefstring, element);
>     // see if the prefstring is locked
>+    if (prefstr)
>+      return Services.prefs.prefIsLocked(prefstr);
>   }
>   return false;
> }
r=me with those issues addressed
Attachment #623424 - Flags: review?(iann_bugzilla) → review+
Attached patch patch v2 (obsolete) — Splinter Review
Attachment #623424 - Attachment is obsolete: true
Attachment #624475 - Flags: review?(mconley)
Blocks: 80855
Comment on attachment 624475 [details] [diff] [review]
patch v2

The code looks good, but it looks like it's broken our account Mozmill tests:

SUMMARY-UNEXPECTED-FAIL | test-mail-account-setup-wizard.js | test-mail-account-setup-wizard.js::test_mail_account_setup
  EXCEPTION: amc.window.smtpService is undefined
    at: test-mail-account-setup-wizard.js line 146
       subtest_verify_account test-mail-account-setup-wizard.js 146
       WindowWatcher_notify test-window-helpers.js 365
make: *** [mozmill-one] Error 1


Once you fix that (looks pretty simple), could you push to try to make sure we're all green?
Attachment #624475 - Flags: review?(mconley) → review-
Attached patch patch v3 (obsolete) — Splinter Review
Fix test. I can't push to try but I ran that one test myself and it failed before and now it passes.
Attachment #624475 - Attachment is obsolete: true
Attachment #626167 - Flags: review?(mconley)
I've pushed this patch to try. If they return, I'll give my r+.

https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=deb08a2ee9d2
So there is a green "B X Z" at the line with this ID. Is that good?
Comment on attachment 626167 [details] [diff] [review]
patch v3

Try build looks OK - the failures that came up are random oranges that we see periodically.
Attachment #626167 - Flags: review?(mconley) → review+
Great!
Keywords: checkin-needed
If somebody checking this in reads the comments too thoroughly, then the part of bug 739573 blocking this was already checked in, so this should be free to check-in. The successful try build should confirm that.
Blocks: 755885
Attached patch patch v4Splinter Review
MPL2 bitrot.
Attachment #626167 - Attachment is obsolete: true
Attachment #628429 - Flags: review+
https://hg.mozilla.org/comm-central/rev/3468a34b21bd
Status: ASSIGNED → RESOLVED
Closed: 12 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 15.0
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: