diff options
| author | Radek Vykydal <rvykydal@redhat.com> | 2013-01-09 14:18:07 +0100 |
|---|---|---|
| committer | Radek Vykydal <rvykydal@redhat.com> | 2013-01-11 09:36:30 +0100 |
| commit | 9991a73b8a05e786749e2714db94a8df4bb865fd (patch) | |
| tree | a9afd036a8ca7fd2a737501e9a66ac57cbcb37ac /pyanaconda | |
| parent | 99c54069f8aee8c4124ee19295e4ce63cea45f6d (diff) | |
| download | anaconda-9991a73b8a05e786749e2714db94a8df4bb865fd.tar.gz anaconda-9991a73b8a05e786749e2714db94a8df4bb865fd.tar.xz anaconda-9991a73b8a05e786749e2714db94a8df4bb865fd.zip | |
Network spoke: use correct state value to display device status.
Use state returned by signal, not current state.
Prevents "Status unknown (missing)" in
NM_DEVICE_STATE_SECONDARIES state.
Diffstat (limited to 'pyanaconda')
| -rw-r--r-- | pyanaconda/ui/gui/spokes/network.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index 01459c3c2..e8f2b9475 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -88,10 +88,9 @@ DEVICES_COLUMN_TITLE = 2 DEVICES_COLUMN_OBJECT = 3 -def localized_string_of_device_state(device): +def localized_string_of_device_state(device, state): str = _("Status unknown (missing)") - state = device.get_state() if state == NetworkManager.DeviceState.UNKNOWN: str = _("Status unknown") elif state == NetworkManager.DeviceState.UNMANAGED: @@ -787,7 +786,7 @@ class NetworkControlBox(object): if state is None: state = device.get_state() self.builder.get_object("label_%s_status" % dev_type_str).set_label( - localized_string_of_device_state(device)) + localized_string_of_device_state(device, state)) switch = self.builder.get_object("device_%s_off_switch" % dev_type_str) if dev_type_str == "wired": |