Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjay Garg <ajay@activitycentral.com>2013-02-23 07:50:13 (GMT)
committer Ajay Garg <ajay@activitycentral.com>2013-02-23 07:50:13 (GMT)
commit5f67601e1e3105a0392b3527212a8cc2424e0b4e (patch)
tree827ee6a9ec6ca943c87f983a4d330a041255eff4
parent349fbeb71fe3ada5f8f54d249959486d3407499a (diff)
Merging http://git.sugarlabs.org/sugar/mainline/commit/2571db3ace84f0240f55e332aab5c3df7c5f23c7
-rw-r--r--extensions/deviceicon/network.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index 6312911..d42e043 100644
--- a/extensions/deviceicon/network.py
+++ b/extensions/deviceicon/network.py
@@ -538,6 +538,7 @@ class WirelessDeviceView(ToolButton):
def __state_changed_cb(self, new_state, old_state, reason):
self._device_state = new_state
+ self._update_color()
self._update_state()
self._device_props.Get(network.NM_WIRELESS_IFACE, 'ActiveAccessPoint',
reply_handler=self.__get_active_ap_reply_cb,
@@ -625,8 +626,10 @@ class WirelessDeviceView(ToolButton):
self._icon.props.base_color = profile.get_color()
- if (state >= network.NM_DEVICE_STATE_PREPARE) and \
- (state <= network.NM_DEVICE_STATE_IP_CONFIG):
+ if state == network.NM_DEVICE_STATE_PREPARE or \
+ state == network.NM_DEVICE_STATE_CONFIG or \
+ state == network.NM_DEVICE_STATE_NEED_AUTH or \
+ state == network.NM_DEVICE_STATE_IP_CONFIG:
self._palette.set_connecting()
self._icon.props.pulsing = True
elif state == network.NM_DEVICE_STATE_ACTIVATED: