sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle the case where we get an Activating event

Browse Source 
but we don't have an active device yet.
This commit is contained in:
Marco Pesenti Gritti 2007-03-02 15:56:06 +01:00
parent baad778406
commit d748682ef7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shell/hardware/nmclient.py
View File

@ -286,6 +286,8 @@ class Device(gobject.GObject):
self.emit('ssid-changed') self.emit('ssid-changed')
def set_active_network(self, network): def set_active_network(self, network):
if self._active_network == network:
return
if self._active_network: if self._active_network:
self._active_network.disconnect(self._ssid_sid) self._active_network.disconnect(self._ssid_sid)
@ -301,12 +303,15 @@ class Device(gobject.GObject):
def set_state(self, state): def set_state(self, state):
self._state = state self._state = state
if state == DEVICE_STATE_ACTIVATING:
obj = sys_bus.get_object(NM_SERVICE, self._op) obj = sys_bus.get_object(NM_SERVICE, self._op)
dev = dbus.Interface(obj, NM_IFACE_DEVICES) dev = dbus.Interface(obj, NM_IFACE_DEVICES)
if self._type == DEVICE_TYPE_802_11_WIRELESS:
network = dev.getActiveNetwork() network = dev.getActiveNetwork()
if self._networks.has_key(network):
self.set_active_network(self._networks[network]) self.set_active_network(self._networks[network])
else:
self.set_active_network(None)
_device_to_network_state = { _device_to_network_state = {
DEVICE_STATE_ACTIVATING : NETWORK_STATE_CONNECTING, DEVICE_STATE_ACTIVATING : NETWORK_STATE_CONNECTING,