From a49a486cef59e54e1060279ad18071b2537904dc Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 26 Feb 2014 08:54:13 +0100
Subject: [PATCH] Fix config bugs

---
 qutebrowser/config/config.py  | 3 +--
 qutebrowser/config/options.py | 4 ++--
 qutebrowser/config/style.py   | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index e6f841be6..cf21d4026 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -99,7 +99,7 @@ class NewConfig:
                 ('statusbar.fg', opt.StatusbarFgColor()),
                 ('statusbar.bg.error', opt.StatusbarBgErrorColor()),
                 ('statusbar.fg.error', opt.StatusbarFgErrorColor()),
-                ('statusbar.progress.pg', opt.StatusbarProgressBgColor()),
+                ('statusbar.progress.bg', opt.StatusbarProgressBgColor()),
                 ('statusbar.url.fg', opt.StatusbarUrlFgColor()),
                 ('statusbar.url.fg.success', opt.StatusbarUrlHoverFgColor()),
                 ('statusbar.url.fg.error', opt.StatusbarUrlErrorFgColor()),
@@ -118,7 +118,6 @@ class NewConfig:
             )),
         ])
 
-
     def __getitem__(self, key):
         """Get a section from the config."""
         return self.config[key]
diff --git a/qutebrowser/config/options.py b/qutebrowser/config/options.py
index 265fa2d40..8d5cf51b7 100644
--- a/qutebrowser/config/options.py
+++ b/qutebrowser/config/options.py
@@ -179,8 +179,8 @@ class CompletionCategoryBgColor(template.ColorSettingValue):
 
     """Background color of the completion widget category headers."""
 
-    default = ("completion.category.bg = qlineargradient("
-               "x1:0, y1:0, x2:0, y2:1, stop:0 #e4e4e4, stop:1 #dbdbdb")
+    default = ("qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #e4e4e4, "
+               "stop:1 #dbdbdb)")
 
 
 class CompletionCategoryTopBorderColor(template.ColorSettingValue):
diff --git a/qutebrowser/config/style.py b/qutebrowser/config/style.py
index 496e06455..d29758a1d 100644
--- a/qutebrowser/config/style.py
+++ b/qutebrowser/config/style.py
@@ -63,7 +63,7 @@ class ColorDict(dict):
 
         """
         try:
-            val = super().__getitem__(key)
+            val = super().__getitem__(key).value
         except KeyError:
             return ''
         if 'fg' in key.split('.'):
@@ -84,7 +84,7 @@ class ColorDict(dict):
 
         """
         try:
-            return super().__getitem__(key)
+            return super().__getitem__(key).value
         except KeyError:
             return None
 
@@ -107,7 +107,7 @@ class FontDict(dict):
 
         """
         try:
-            val = super().__getitem__(key)
+            val = super().__getitem__(key).value
         except KeyError:
             return ''
         else:
@@ -124,6 +124,6 @@ class FontDict(dict):
 
         """
         try:
-            return super().__getitem__(key)
+            return super().__getitem__(key).value
         except KeyError:
             return None