[meld] gutterrendererchunk: Don't draw actions for equal chunks



commit 12f569b08715751eb20eeb09c2c03b404b48c348
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Jun 19 06:08:19 2014 +1000

    gutterrendererchunk: Don't draw actions for equal chunks

 meld/gutterrendererchunk.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meld/gutterrendererchunk.py b/meld/gutterrendererchunk.py
index 92ff6cf..fe2fd62 100644
--- a/meld/gutterrendererchunk.py
+++ b/meld/gutterrendererchunk.py
@@ -121,9 +121,9 @@ class GutterRendererChunkAction(GtkSource.GutterRendererPixbuf):
 
         pixbuf = None
         if chunk_index is not None:
-            chunk = self.linediffer.get_chunk(chunk_index, self.from_pane)
-            # FIXME: This is all chunks, not just those shared with to_pane
-            if chunk[1] == line:
+            chunk = self.linediffer.get_chunk(
+                chunk_index, self.from_pane, self.to_pane)
+            if chunk and chunk[1] == line:
                 action = self._classify_change_actions(chunk)
                 pixbuf = self.action_map.get(action)
         if pixbuf:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]