Changeset d98906

Timestamp:

Oct 13, 2014, 11:25:35 AM (6 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

30b134a0e250d98615ebc65fa342562eed40a367, 767529

Parents:

25edf9

Message:

rearranged LastKey? decrease

File:

• modules/vI_account.js (modified) (3 diffs)

modules/vI_account.js

@@ -233 +233 @@
             account.__removeAccountPrefs("account" + key);
         }
-        
-        for (let acc = 0; acc < accounts.length; acc++) {
-            let checkAccount = accounts[acc];
-            if (account.__isVIdentityAccount(checkAccount)) {
-                account.__removeAccount(checkAccount);
-            }
-        }
         Log.debug("done.")
         account.__cleanupDirectories();
@@ -258 +251 @@
         try {
             prefroot.clearUserPref("mail.account." + key + ".vIdentity");
-            // prevent useless increasing of lastKey https://bugzilla.mozilla.org/show_bug.cgi?id=485839
-            var lastAccountKey = prefroot.getIntPref("mail.account.lastKey");
-            if ("account" + lastAccountKey == key)
-                prefroot.setIntPref("mail.account.lastKey", lastAccountKey - 1);
         }
         catch (e) { };
@@ -296 +285 @@
         // remove the account
         account._AccountManager.removeAccount(checkAccount);
-        
+
+        // prevent useless increasing of lastKey https://bugzilla.mozilla.org/show_bug.cgi?id=485839
+        var lastAccountKey = prefroot.getIntPref("mail.account.lastKey");
+        if ("account" + lastAccountKey == key)
+            prefroot.setIntPref("mail.account.lastKey", lastAccountKey - 1);
+
         account.__removeAccountPrefs(key);
     },