Description: Fix crash trying to insert integers into a text column
Author: Iain Buclaw
Bug-Ubuntu: http://launchpad.net/bugs/703603

=== modified file 'tree.py'
Index: meld-1.5.0/meld/tree.py
===================================================================
--- meld-1.5.0.orig/meld/tree.py	2010-12-27 09:10:50.000000000 +1100
+++ meld-1.5.0/meld/tree.py	2011-01-19 15:02:51.343726931 +1100
@@ -90,8 +90,8 @@
     def add_empty(self, parent, text="empty folder"):
         child = self.append(parent)
         for i in range(self.ntree):
-            self.set_value(child, self.column_index(COL_STATE,i), STATE_EMPTY)
-            self.set_value(child, self.column_index(COL_PATH,i), self.pixstyle[STATE_EMPTY])
+            self.set_value(child, self.column_index(COL_STATE,i), str(STATE_EMPTY))
+            self.set_value(child, self.column_index(COL_PATH,i), str(self.pixstyle[STATE_EMPTY]))
             self.set_value(child, self.column_index(COL_TEXT, i), self.textstyle[STATE_EMPTY] % gobject.markup_escape_text(text))
         return child
 
@@ -118,7 +118,7 @@
         TEXT  = self.column_index(COL_TEXT,  pane)
         ICON  = self.column_index(COL_ICON,  pane)
         TINT  = self.column_index(COL_TINT,  pane)
-        self.set_value(it, STATE, state)
+        self.set_value(it, STATE, str(state))
         self.set_value(it, TEXT,  self.textstyle[state] % name)
         self.set_value(it, ICON,  self.pixstyle[state][isdir])
         self.set_value(it, TINT,  self.icon_tints[state][isdir])