[meld] Synchronise several colours between icon tints and text attributes

[Kai Willadsen <kaiw src gnome org>]

commit 7f687af7a509f0f1d9ce3c00d1715628b5c8f838
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Jan 2 11:31:57 2012 +1000

    Synchronise several colours between icon tints and text attributes

 meld/tree.py |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/meld/tree.py b/meld/tree.py
index 0e75486..926d135 100644
--- a/meld/tree.py
+++ b/meld/tree.py
@@ -53,7 +53,7 @@ class DiffTreeStore(gtk.TreeStore):
             (None,      None,      roman,     normal, None), # STATE_NORMAL
             (None,      None,      italic,    normal, None), # STATE_NOCHANGE
             ("#ff0000", "yellow",  roman,     bold,   None), # STATE_ERROR
-            ("#999999", None,      italic,    normal, None), # STATE_EMPTY
+            ("#888888", None,      italic,    normal, None), # STATE_EMPTY
             ("#008800", None,      roman,     bold,   None), # STATE_NEW
             ("#880000", None,      roman,     bold,   None), # STATE_MODIFIED
             ("#ff0000", "#ffeeee", roman,     bold,   None), # STATE_CONFLICT
@@ -69,11 +69,11 @@ class DiffTreeStore(gtk.TreeStore):
             ("text-x-generic", "folder", None,      None),      # NOCHANGE
             (None,             None    , None,      None),      # ERROR
             (None,             None    , None,      None),      # EMPTY
-            ("text-x-generic", "folder", "#00ff00", None),      # NEW
-            ("text-x-generic", "folder", "#ff0000", None),      # MODIFIED
-            ("text-x-generic", "folder", "#ff0000", None),      # CONFLICT
-            ("text-x-generic", "folder", "#ff0000", None),      # REMOVED
-            ("text-x-generic", "folder", "#ffffff", "#ffffff"), # MISSING
+            ("text-x-generic", "folder", "#008800", None),      # NEW
+            ("text-x-generic", "folder", "#880000", None),      # MODIFIED
+            ("text-x-generic", "folder", "#880000", None),      # CONFLICT
+            ("text-x-generic", "folder", "#880000", None),      # REMOVED
+            ("text-x-generic", "folder", "#888888", "#888888"), # MISSING
         ]
 
         assert len(self.icon_details) == len(self.text_attributes) == STATE_MAX