diff options
| author | Marco Pesenti Gritti <marco@marcopg.org> | 2008-12-17 12:22:40 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@marcopg.org> | 2008-12-17 12:22:40 (GMT) |
| commit | 96bcea86e83276c88530e2b863c8482206b6f7bc (patch) | |
| tree | 68828fd63cda5039649aef50518dbce15b2ac472 /src | |
| parent | cab7ae9bb296a0d8342df461b8f7bdf926f0e17d (diff) | |
| parent | 1b2a2789f459765f66cb81925f6ee9b55fcd00f9 (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/sugar/mainline
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/desktop/meshbox.py | 13 | ||||
| -rw-r--r-- | src/jarabe/model/network.py | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index 43506e2..e650ba7 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -647,10 +647,15 @@ class NetworkManagerObserver(object): for conn_o in active_connections_o: obj = self._bus.get_object(_NM_IFACE, conn_o) props = dbus.Interface(obj, 'org.freedesktop.DBus.Properties') - ap_o = props.Get(_NM_ACTIVE_CONN_IFACE, 'SpecificObject') - - ap_view = self._box.access_points[ap_o] - ap_view.create_keydialog(kwargs['response']) + state = props.Get(_NM_ACTIVE_CONN_IFACE, 'State') + if state == network.NM_ACTIVE_CONNECTION_STATE_ACTIVATING: + ap_o = props.Get(_NM_ACTIVE_CONN_IFACE, 'SpecificObject') + if ap_o != '/': + ap_view = self._box.access_points[ap_o] + ap_view.create_keydialog(kwargs['response']) + else: + logging.error('Could not determine AP for' + ' specific object %s' % conn_o) def __get_devices_reply_cb(self, devices_o): for dev_o in devices_o: diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index d793deb..866f079 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -36,6 +36,10 @@ DEVICE_STATE_IP_CONFIG = 7 DEVICE_STATE_ACTIVATED = 8 DEVICE_STATE_FAILED = 9 +NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0 +NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1 +NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2 + NM_802_11_AP_FLAGS_NONE = 0x00000000 NM_802_11_AP_FLAGS_PRIVACY = 0x00000001 |