[meld/VersionControlRework: 28/28] vcview: Fix bad merge



commit 1e88b91262a9d656d2bcca280fb4ecfc8f82f5d5
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jun 28 10:58:36 2015 +1000

    vcview: Fix bad merge

 meld/vcview.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/meld/vcview.py b/meld/vcview.py
index ba5f38f..8986da6 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -118,6 +118,10 @@ class VcTreeStore(tree.DiffTreeStore):
     def __init__(self):
         tree.DiffTreeStore.__init__(self, 1, [str] * 5)
 
+    def get_file_path(self, it):
+        # Use instead of value_path; does not incorrectly decode
+        return self.get_value(it, self.column_index(tree.COL_PATH, 0))
+
 
 class VcView(melddoc.MeldDoc, gnomeglade.Component):
 


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