Changeset 1e1bc6
- Timestamp:
- Oct 13, 2014, 2:44:34 PM (6 years ago)
- Branches:
- ng_0.9
- Children:
- 71e022
- Parents:
- 0fac58130037b7e736e352e8c8df8159fa3c8bc1 (diff), 767529 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
modules/vI_account.js
r767529 r1e1bc6 214 214 Log.debug("checking for leftover VirtualIdentity accounts ...") 215 215 var accounts = getAccountsArray(); 216 // Log.debug("number of currently used accounts = " + accounts.length);217 216 218 217 for (let acc = 0; acc < accounts.length; acc++) { … … 223 222 // replace account with key, required for next check 224 223 accounts[acc] = accounts[acc].key; 225 // Log.debug("current account = " + accounts[acc]); 226 } 227 228 // var usedAccounts = prefroot.getCharPref("mail.accountmanager.accounts"); 229 var lastAccountKey = prefroot.getIntPref("mail.account.lastKey"); 230 // Log.debug("number of last AccountKey = " + lastAccountKey); 231 for (let key = 0; key <= lastAccountKey; key++) { 232 if (accounts.indexOf("account" + key) > -1) continue; 233 account.__removeAccountPrefs("account" + key); 234 } 224 } 225 226 // account-prefs are not removed, grrrr --> https://bugzilla.mozilla.org/show_bug.cgi?id=875675 227 try { 228 var lastAccountKey = prefroot.getIntPref("mail.account.lastKey"); 229 for (let key = 0; key <= lastAccountKey; key++) { 230 if (accounts.indexOf("account" + key) > -1) continue; 231 account.__removeAccountPrefs("account" + key); 232 } 233 } 234 catch (e) {}; 235 235 Log.debug("done.") 236 236 account.__cleanupDirectories(); … … 287 287 288 288 // prevent useless increasing of lastKey https://bugzilla.mozilla.org/show_bug.cgi?id=485839 289 var lastAccountKey = prefroot.getIntPref("mail.account.lastKey"); 290 if ("account" + lastAccountKey == key) 291 prefroot.setIntPref("mail.account.lastKey", lastAccountKey - 1); 289 try { 290 var lastAccountKey = prefroot.getIntPref("mail.account.lastKey"); 291 if ("account" + lastAccountKey == key) 292 prefroot.setIntPref("mail.account.lastKey", lastAccountKey - 1); 293 } 294 catch (e) { }; 292 295 293 296 account.__removeAccountPrefs(key);
Note: See TracChangeset
for help on using the changeset viewer.