diff options
author | Richard W.M. Jones <rjones@redhat.com> | 2013-06-28 18:45:53 +0100 |
---|---|---|
committer | Cole Robinson <crobinso@redhat.com> | 2013-12-05 15:52:30 -0500 |
commit | 0c1ffd0c77891e316d611e2f14a5a5d56856e482 (patch) | |
tree | 5dc9d72443b3ead8e1c87ea474e943f313fdf7bd | |
parent | 31df56b9e6b07f2eb552f993d0a0c5629aac99ee (diff) | |
download | virt-manager-0c1ffd0c77891e316d611e2f14a5a5d56856e482.tar.gz |
inspection: Check can_set_row_none before setting icon to None.
Previously one could set the icon field of a tree model to None, but
with Gtk3 and older versions of pygobject3 this would fail.
Use can_set_row_none to test for this condition and work around it.
The previous traceback was:
Traceback (most recent call last):
File "/home/rjones/d/virt-manager/virtManager/manager.py", line 981, in vm_inspection_changed
self.get_inspection_icon_pixbuf(vm, 16, 16)
File "/usr/lib64/python2.7/site-packages/gi/overrides/Gtk.py", line 1152, in __setitem__
self.model.set_value(self.iter, key, value)
File "/usr/lib64/python2.7/site-packages/gi/overrides/Gtk.py", line 1298, in set_value
Gtk.TreeStore.set_value(self, treeiter, column, value)
File "/usr/lib64/python2.7/site-packages/gi/types.py", line 47, in function
return info.invoke(*args, **kwargs)
TypeError: Argument 3 does not allow None as a value
(cherry picked from commit 9d5c1cdb1c03a8c045ae94ab5324aa7dda68e695)
-rw-r--r-- | virtManager/manager.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/virtManager/manager.py b/virtManager/manager.py index ca9d909a..3682429c 100644 --- a/virtManager/manager.py +++ b/virtManager/manager.py @@ -959,8 +959,10 @@ class vmmManager(vmmGObjectUI): return row = self.rows[self.vm_row_key(vm)] - row[ROW_INSPECTION_OS_ICON] = \ - self.get_inspection_icon_pixbuf(vm, 16, 16) + new_icon = self.get_inspection_icon_pixbuf(vm, 16, 16) + if not can_set_row_none: + new_icon = new_icon or "" + row[ROW_INSPECTION_OS_ICON] = new_icon model.row_changed(row.path, row.iter) def get_inspection_icon_pixbuf(self, vm, w, h): |