From a29c4bd9f585cba5e81cba9414273f5dc1a17552 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 17 Sep 2009 08:27:08 -0400
Subject: [PATCH] Be nicer to color blind people.

---
 common/content/style.js    |  2 +-
 common/modules/storage.jsm | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/common/content/style.js b/common/content/style.js
index c984fe80..0d6847f4 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -29,7 +29,7 @@ Highlights.prototype.CSS = <![CDATA[
     Object      color: maroon;
     String      color: green;
 
-    Enabled     color: green;
+    Enabled     color: blue;
     Disabled    color: red;
 
     Normal      color: black; background: white;
diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm
index ff10e22d..0ccfdd72 100755
--- a/common/modules/storage.jsm
+++ b/common/modules/storage.jsm
@@ -136,19 +136,23 @@ function setCharPref(name, value)
 
 function loadPref(name, store, type)
 {
-    if (store)
-        var pref = getCharPref(name);
-    if (!pref && storage.infoPath)
-        var file = readFile(getFile(name));
-    if (pref || file)
-        var result = json.decode(pref || file);
-    if (pref)
+    try
     {
-        prefService.clearUserPref(name);
-        savePref({ name: name, store: true, serial: pref });
+        if (store)
+            var pref = getCharPref(name);
+        if (!pref && storage.infoPath)
+            var file = readFile(getFile(name));
+        if (pref || file)
+            var result = json.decode(pref || file);
+        if (pref)
+        {
+            prefService.clearUserPref(name);
+            savePref({ name: name, store: true, serial: pref });
+        }
+        if (result instanceof type)
+            return result;
     }
-    if (result instanceof type)
-        return result;
+    catch (e) {}
 }
 
 function savePref(obj)