Fix serialize_val method

QubesOS · Nov 8, 2016 · d07e35a · d07e35a
1 parent 88fa439
commit d07e35a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/qubesdbus/serialize.py b/qubesdbus/serialize.py
@@ -109,15 +109,15 @@ def serialize_val(value):
     elif isinstance(value, int):
         return dbus.Int32(value)
     elif callable(value):
-        return serialize_val(value)
+        return serialize_val(value())
     elif isinstance(value, qubes.Label):
         return label_path(value)
     elif isinstance(value, qubes.vm.qubesvm.QubesVM):
         return domain_path(value)
     elif isinstance(value, qubes.devices.DeviceCollection):
         return dbus.Array(device_collection_data(value), signature='a{sv}')
     elif isinstance(value, qubes.devices.DeviceInfo):
-        return dbus.Dictionary(device_collection_data(value), signature='sv')
+        return dbus.Dictionary(device_data(value), signature='sv')
     elif isinstance(value, re._pattern_type):
         return dbus.String(value.pattern)
     else: