diff options
author | Dan Williams <dcbw@redhat.com> | 2007-04-05 03:48:09 (GMT) |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2007-04-05 03:48:09 (GMT) |
commit | 4b4cf9673c0afc7e220ff3c34023f3ce4537591a (patch) | |
tree | 255e9fcad673985edcfedf7d03998ba5e5dc53a9 /shell/model/devices/network/mesh.py | |
parent | ba08492778261828e4411e0b8d1e4a47f21dbe52 (diff) |
Cleanup of sugar device handling code
Diffstat (limited to 'shell/model/devices/network/mesh.py')
-rw-r--r-- | shell/model/devices/network/mesh.py | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/shell/model/devices/network/mesh.py b/shell/model/devices/network/mesh.py index 63f7b23..0bcc9fd 100644 --- a/shell/model/devices/network/mesh.py +++ b/shell/model/devices/network/mesh.py @@ -20,22 +20,12 @@ import gobject from model.devices import device from hardware import nmclient -STATE_ACTIVATING = 0 -STATE_ACTIVATED = 1 -STATE_INACTIVE = 2 - -_nm_state_to_state = { - nmclient.DEVICE_STATE_ACTIVATING : STATE_ACTIVATING, - nmclient.DEVICE_STATE_ACTIVATED : STATE_ACTIVATED, - nmclient.DEVICE_STATE_INACTIVE : STATE_INACTIVE -} - class Device(device.Device): __gproperties__ = { 'strength' : (int, None, None, 0, 100, 0, gobject.PARAM_READABLE), - 'state' : (int, None, None, STATE_ACTIVATING, - STATE_INACTIVE, 0, gobject.PARAM_READABLE) + 'state' : (int, None, None, device.STATE_ACTIVATING, + device.STATE_INACTIVE, 0, gobject.PARAM_READABLE) } def __init__(self, nm_device): @@ -58,10 +48,10 @@ class Device(device.Device): return self._nm_device.get_strength() elif pspec.name == 'state': nm_state = self._nm_device.get_state() - return _nm_state_to_state[nm_state] + return device._nm_state_to_state[nm_state] def get_type(self): return 'network.mesh' def get_id(self): - return self._nm_device.get_op() + return str(self._nm_device.get_op()) |