[meld] gtkrc, filediff: Update Meld's colour scheme slightly

[Kai Willadsen <kaiw src gnome org>]

commit a164ae39b8d43c6d44e0a1fb54a8156b67133b91
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Oct 18 07:51:19 2012 +1000

    gtkrc, filediff: Update Meld's colour scheme slightly
    
    While this isn't final, our colours aren't great. One of the biggest
    issues is that we set a foreground colour in inline highlighting,
    which is guaranteed to clash with any use of syntax highlighting.

 data/gtkrc       |    9 ++++-----
 meld/filediff.py |    1 -
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/data/gtkrc b/data/gtkrc
index 1885d9b..04f3fea 100644
--- a/data/gtkrc
+++ b/data/gtkrc
@@ -1,7 +1,7 @@
 
 style "meld-color-scheme"
 {
-    color["insert-bg"] = "DarkSeaGreen1"
+    color["insert-bg"] = "#d0ffa3"
     color["insert-outline"] = shade(0.8, @insert-bg)
     color["insert-text"] = "#008800"
 
@@ -9,11 +9,11 @@ style "meld-color-scheme"
     color["delete-outline"] = shade(0.8, @delete-bg)
     color["delete-text"] = "#880000"
 
-    color["replace-bg"] = "#ddeeff"
+    color["replace-bg"] = "#bdddff"
     color["replace-outline"] = shade(0.8, @replace-bg)
     color["replace-text"] = "#0044dd"
 
-    color["conflict-bg"] = "Pink"
+    color["conflict-bg"] = "#ffa5a3"
     color["conflict-outline"] = shade(0.8, @conflict-bg)
     color["conflict-text"] = "#ff0000"
 
@@ -21,8 +21,7 @@ style "meld-color-scheme"
     color["error-outline"] = shade(0.8, @error-bg)
     color["error-text"] = "#faad3d"
 
-    color["inline-bg"] = "LightSteelBlue2"
-    color["inline-fg"] = "Red"
+    color["inline-bg"] = "#8ac2ff"
 
     color["unknown-text"] = "#888888"
 
diff --git a/meld/filediff.py b/meld/filediff.py
index 0ca8f27..0b2957c 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -418,7 +418,6 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         for buf in self.textbuffer:
             tag = buf.get_tag_table().lookup("inline")
             tag.props.background_rgba = lookup("inline-bg", "LightSteelBlue2")
-            tag.props.foreground_rgba = lookup("inline-fg", "Red")
 
         self.fill_colors = {"insert"  : lookup("insert-bg", "DarkSeaGreen1"),
                             "delete"  : lookup("insert-bg", "DarkSeaGreen1"),