a31cbb6
From d5a737e728351deeda858527999346d79abdb2f9 Mon Sep 17 00:00:00 2001
a31cbb6
Message-Id: <d5a737e728351deeda858527999346d79abdb2f9.1384101775.git.crobinso@redhat.com>
a31cbb6
From: Giuseppe Scrivano <gscrivan@redhat.com>
a31cbb6
Date: Wed, 30 Oct 2013 17:00:15 +0100
a31cbb6
Subject: [PATCH] virtManager: do not call set_cell_data_func with an empty
a31cbb6
 func
a31cbb6
a31cbb6
It fixes this exception:
a31cbb6
a31cbb6
Traceback (most recent call last):
a31cbb6
  File "src/virt-manager/virtManager/engine.py", line 133, in _activate
a31cbb6
    self.show_manager()
a31cbb6
  File "src/virt-manager/virtManager/engine.py", line 867, in show_manager
a31cbb6
    self._do_show_manager(None)
a31cbb6
  File "src/virt-manager/virtManager/engine.py", line 811, in _do_show_manager
a31cbb6
    manager = self.get_manager()
a31cbb6
  File "src/virt-manager/virtManager/engine.py", line 772, in get_manager
a31cbb6
    obj = vmmManager()
a31cbb6
  File "src/virt-manager/virtManager/manager.py", line 173, in __init__
a31cbb6
    self.init_stats()
a31cbb6
  File "src/virt-manager/virtManager/manager.py", line 276, in init_stats
a31cbb6
    self.toggle_host_cpu_usage_visible_widget()
a31cbb6
  File "src/virt-manager/virtManager/manager.py", line 1026, in toggle_host_cpu_usage_visible_widget
a31cbb6
    self.host_cpu_usage_img, "menu_view_stats_host_cpu")
a31cbb6
  File "src/virt-manager/virtManager/manager.py", line 1003, in _toggle_graph_helper
a31cbb6
    col.set_cell_data_func(img, datafunc, None)
a31cbb6
  File "/usr/lib/python2.7/site-packages/gi/overrides/Gtk.py", line 1320, in set_cell_data_func
a31cbb6
    super(TreeViewColumn, self).set_cell_data_func(cell_renderer, func, func_data)
a31cbb6
TypeError: When passing None for a callback userdata must also be None
a31cbb6
a31cbb6
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1024569
a31cbb6
a31cbb6
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
a31cbb6
---
a31cbb6
 virtManager/manager.py | 5 ++---
a31cbb6
 1 file changed, 2 insertions(+), 3 deletions(-)
a31cbb6
a31cbb6
diff --git a/virtManager/manager.py b/virtManager/manager.py
a31cbb6
index 114904b..fe5be75 100644
a31cbb6
--- a/virtManager/manager.py
a31cbb6
+++ b/virtManager/manager.py
a31cbb6
@@ -998,9 +998,8 @@ class vmmManager(vmmGObjectUI):
a31cbb6
         for child in col.get_cells():
a31cbb6
             if isinstance(child, CellRendererSparkline):
a31cbb6
                 img = child
a31cbb6
-        datafunc = do_show and datafunc or None
a31cbb6
-
a31cbb6
-        col.set_cell_data_func(img, datafunc, None)
a31cbb6
+        if do_show:
a31cbb6
+            col.set_cell_data_func(img, datafunc, None)
a31cbb6
         col.set_visible(do_show)
a31cbb6
         self.widget(menu).set_active(do_show)
a31cbb6
 
a31cbb6
-- 
a31cbb6
1.8.4.2
a31cbb6