meld r1102 - trunk

[kaiw svn gnome org]

Author: kaiw
Date: Sun Dec 28 10:25:18 2008
New Revision: 1102
URL: http://svn.gnome.org/viewvc/meld?rev=1102&view=rev

Log:
Use the correct colour for conflicts in the FileDiff linkmap

Modified:
   trunk/filediff.py

Modified: trunk/filediff.py
==============================================================================
--- trunk/filediff.py	(original)
+++ trunk/filediff.py	Sun Dec 28 10:25:18 2008
@@ -1226,6 +1226,8 @@
                 
                 if c[0] in ("insert", "delete"):
                     bg = gdk.color_parse(self.prefs.color_delete_bg)
+                elif c[0] == "conflict":
+                    bg = gdk.color_parse(self.prefs.color_conflict_bg)
                 else: #replace
                     bg = gdk.color_parse(self.prefs.color_replace_bg)