diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-07-11 10:35:34 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-07-11 10:35:34 (GMT) |
| commit | 85cac7c07199e72a1e5c0209b043c7111b870711 (patch) | |
| tree | 0a488413f1a2ef03938a30b544443a5f2fa4828d /shell | |
| parent | d59cd5af83dad1d6ff852f4601144c951df1920f (diff) | |
| parent | 0c1a017932cb80832fcf0863a38f48d9e08cb311 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/hardware/nmclient.py | 6 | ||||
| -rw-r--r-- | shell/model/devices/network/wireless.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/shell/hardware/nmclient.py b/shell/hardware/nmclient.py index 631a352..b699a04 100644 --- a/shell/hardware/nmclient.py +++ b/shell/hardware/nmclient.py @@ -211,7 +211,6 @@ class Device(gobject.GObject): self._networks = {} self._caps = 0 self._state = DEVICE_STATE_INACTIVE - self._ssid = None self._active_network = None obj = sys_bus.get_object(NM_SERVICE, self._op) @@ -401,7 +400,10 @@ class Device(gobject.GObject): error_handler=self._get_active_net_error_cb) def get_ssid(self): - return self._ssid + if self._active_network and self._active_network.is_valid(): + return self._active_network.get_ssid() + elif not self._active_network: + return None def get_type(self): return self._type diff --git a/shell/model/devices/network/wireless.py b/shell/model/devices/network/wireless.py index 20d2094..bc6c9dd 100644 --- a/shell/model/devices/network/wireless.py +++ b/shell/model/devices/network/wireless.py @@ -54,6 +54,8 @@ class Device(device.Device): if pspec.name == 'strength': return self._nm_device.get_strength() elif pspec.name == 'name': + import logging + logging.debug('wireless.Device.props.name: %s' % self._nm_device.get_ssid()) return self._nm_device.get_ssid() elif pspec.name == 'state': nm_state = self._nm_device.get_state() |