6326: Running Export View crashes with 'tuple' object has no attribute 'get_indices'

svn: r21120
This commit is contained in:
Benny Malengier 2013-01-14 18:57:47 +00:00
parent ae517eb9c7
commit 00bd4b81f8
2 changed files with 13 additions and 6 deletions

View File

@ -1071,18 +1071,22 @@ class ListView(NavigationView):
if node is None:
return
while node is not None:
new_level = level + [self.model.do_get_value(node, 0)]
iternode = self.model.get_iter(node)
new_level = level + [self.model.do_get_value(iternode, 0)]
if self.model.get_handle(node):
ofile.start_row()
padded_level = new_level + [''] * (depth - len(new_level))
list(map(ofile.write_cell, padded_level))
for index in data_cols:
ofile.write_cell(self.model.do_get_value(node, index))
ofile.write_cell(self.model.do_get_value(iternode, index))
ofile.end_row()
has_child, first_child = self.model.do_iter_children(node)
self.write_node(first_child, depth, new_level, ofile, data_cols)
has_next = self.model.do_iter_next(node)
has_child, first_child = self.model.do_iter_children(iternode)
if has_child:
self.write_node(self.model.get_node_from_iter(first_child),
depth, new_level, ofile, data_cols)
has_next = self.model.do_iter_next(iternode)
node = self.model.get_node_from_iter(iternode)
if not has_next:
node = None

View File

@ -940,7 +940,10 @@ class TreeBaseModel(GObject.Object, Gtk.TreeModel):
if not self.tree or not self.tree[None].children:
return False, Gtk.TreeIter()
node = self.tree[None]
pathlist = path.get_indices()
if isinstance(path, tuple):
pathlist = path
else:
pathlist = path.get_indices()
for index in pathlist:
_index = (-index - 1) if self.__reverse else index
node = self.nodemap.node(node.children[_index][1])