meld r1201 - trunk

[vincele svn gnome org]

Author: vincele
Date: Mon Mar  2 22:10:48 2009
New Revision: 1201
URL: http://svn.gnome.org/viewvc/meld?rev=1201&view=rev

Log:
Fix bug introduced in r1196 : COL_NUM should be passed to
constructor, else it will be wrong


Modified:
   trunk/tree.py
   trunk/vcview.py

Modified: trunk/tree.py
==============================================================================
--- trunk/tree.py	(original)
+++ trunk/tree.py	Mon Mar  2 22:10:48 2009
@@ -36,8 +36,8 @@
 pixbuf_file_changed = load("tree-file-changed.png")
 
 class DiffTreeStore(gtk.TreeStore):
-    def __init__(self, ntree = 3):
-        types = [type("")] * COL_END * ntree
+    def __init__(self, ntree = 3, num_col = COL_END):
+        types = [type("")] * num_col * ntree
         types[COL_ICON*ntree:COL_ICON*ntree+ntree] = [type(pixbuf_file)] * ntree
         gtk.TreeStore.__init__(self, *types)
         self.ntree = ntree

Modified: trunk/vcview.py
==============================================================================
--- trunk/vcview.py	(original)
+++ trunk/vcview.py	Mon Mar  2 22:10:48 2009
@@ -89,7 +89,7 @@
 
 class VcTreeStore(tree.DiffTreeStore):
     def __init__(self):
-        tree.DiffTreeStore.__init__(self, 1)
+        tree.DiffTreeStore.__init__(self, 1, COL_END)
         self.textstyle[tree.STATE_MISSING] = '<span foreground="#000088" strikethrough="true" weight="bold">%s</span>'
 
 ################################################################################