From 7ca2086c7336b9404bcf5861d71ba1943ff4bf3a Mon Sep 17 00:00:00 2001
From: Daniel Applebaum <danapple@danapple.com>
Date: Sat, 22 May 2010 14:07:02 +0000
Subject: [PATCH] Fixes Issue 1652 Fixes Issue 1644

Grab correct color from preferences storage for LED.

Also, remove LED and chip colors on account deletion.
---
 src/com/fsck/k9/Account.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index deafcf9f4..d79e6a238 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -242,7 +242,7 @@ public class Account implements BaseAccount
                      (random.nextInt(0x70) * 0xffff) +
                      0xff000000);
 
-        mLedColor = preferences.getPreferences().getInt(mUuid+".chipColor", mChipColor);
+        mLedColor = preferences.getPreferences().getInt(mUuid+".ledColor", mChipColor);
 
         mVibrate = preferences.getPreferences().getBoolean(mUuid + ".vibrate", false);
         mRing = preferences.getPreferences().getBoolean(mUuid + ".ring", true);
@@ -367,6 +367,8 @@ public class Account implements BaseAccount
         editor.remove(mUuid + ".expungePolicy");
         editor.remove(mUuid + ".maxPushFolders");
         editor.remove(mUuid  + ".searchableFolders");
+        editor.remove(mUuid  + ".chipColor");
+        editor.remove(mUuid  + ".ledColor");
         editor.remove(mUuid + ".goToUnreadMessageSearch");
         for (String type : networkTypes)
         {