Changeset 1e1bc6

Timestamp:

Oct 13, 2014, 2:44:34 PM (6 years ago)

Author:

rene <rene@…>

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.

Message:

Merge branch 'ng_0.9' of ​ssh://ejury.de/var/git/v_identity into ng_0.9

File:

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

modules/vI_account.js

@@ -214 +214 @@
         Log.debug("checking for leftover VirtualIdentity accounts ...")
         var accounts = getAccountsArray();
-//         Log.debug("number of currently used accounts = " + accounts.length);
 
         for (let acc = 0; acc < accounts.length; acc++) {
@@ -223 +222 @@
             // replace account with key, required for next check
             accounts[acc] = accounts[acc].key;
-//             Log.debug("current account = " + accounts[acc]);
-        }
-        
-//         var usedAccounts = prefroot.getCharPref("mail.accountmanager.accounts");
-        var lastAccountKey = prefroot.getIntPref("mail.account.lastKey");
-//         Log.debug("number of last AccountKey = " + lastAccountKey);
-        for (let key = 0; key <= lastAccountKey; key++) {
-            if (accounts.indexOf("account" + key) > -1) continue;
-            account.__removeAccountPrefs("account" + key);
-        }
+        }
+
+        //      account-prefs are not removed, grrrr --> https://bugzilla.mozilla.org/show_bug.cgi?id=875675
+        try {
+            var lastAccountKey = prefroot.getIntPref("mail.account.lastKey");
+            for (let key = 0; key <= lastAccountKey; key++) {
+                if (accounts.indexOf("account" + key) > -1) continue;
+                account.__removeAccountPrefs("account" + key);
+            }
+        }
+        catch (e) {};
         Log.debug("done.")
         account.__cleanupDirectories();
@@ -287 +287 @@
 
         // 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);
+        try {
+            var lastAccountKey = prefroot.getIntPref("mail.account.lastKey");
+            if ("account" + lastAccountKey == key)
+                prefroot.setIntPref("mail.account.lastKey", lastAccountKey - 1);
+        }
+        catch (e) { };
 
         account.__removeAccountPrefs(key);