Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

3 files changed, 10 insertions, 9 deletions

diff --git a/shell/view/devices/network/mesh.py b/shell/view/devices/network/mesh.py
index 78442cb..c925946 100644
--- a/shell/view/devices/network/mesh.py
+++ b/shell/view/devices/network/mesh.py
@@ -18,7 +18,7 @@
 from sugar.graphics import canvasicon
 from sugar.graphics import color
 from sugar.graphics import units
-from model.devices.network import mesh
+from model.devices import device
 
 class DeviceView(canvasicon.CanvasIcon):
     def __init__(self, model):
@@ -35,12 +35,12 @@ class DeviceView(canvasicon.CanvasIcon):
     def _update_state(self):
         # FIXME Change icon colors once we have real icons
         state = self._model.props.state
-        if state == mesh.STATE_ACTIVATING:
+        if state == device.STATE_ACTIVATING:
             self.props.fill_color = color.ICON_FILL_INACTIVE
             self.props.stroke_color = color.ICON_STROKE_INACTIVE
-        elif state == mesh.STATE_ACTIVATED:
+        elif state == device.STATE_ACTIVATED:
             self.props.fill_color = None
             self.props.stroke_color = None
-        elif state == mesh.STATE_INACTIVE:
+        elif state == device.STATE_INACTIVE:
             self.props.fill_color = color.ICON_FILL_INACTIVE
             self.props.stroke_color = color.ICON_STROKE_INACTIVE
diff --git a/shell/view/devices/network/wireless.py b/shell/view/devices/network/wireless.py
index dd079cc..a949f1c 100644
--- a/shell/view/devices/network/wireless.py
+++ b/shell/view/devices/network/wireless.py
@@ -20,6 +20,7 @@ from sugar.graphics import color
 from sugar.graphics import units
 from model.devices.network import wireless
 from sugar.graphics.canvasicon import CanvasIcon
+from model.devices import device
 
 _ICON_NAME = 'device-network-wireless'
 
@@ -57,12 +58,12 @@ class DeviceView(CanvasIcon):
     def _update_state(self):
         # FIXME Change icon colors once we have real icons
         state = self._model.props.state
-        if state == wireless.STATE_ACTIVATING:
+        if state == device.STATE_ACTIVATING:
             self.props.fill_color = color.ICON_FILL_INACTIVE
             self.props.stroke_color = color.ICON_STROKE_INACTIVE
-        elif state == wireless.STATE_ACTIVATED:
+        elif state == device.STATE_ACTIVATED:
             self.props.fill_color = None
             self.props.stroke_color = None
-        elif state == wireless.STATE_INACTIVE:
+        elif state == device.STATE_INACTIVE:
             self.props.fill_color = color.ICON_FILL_INACTIVE
             self.props.stroke_color = color.ICON_STROKE_INACTIVE
diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py
index 322d07f..20829a0 100644
--- a/shell/view/home/MeshBox.py
+++ b/shell/view/home/MeshBox.py
@@ -239,7 +239,7 @@ class MeshBox(SpreadBox):
         self._add_mesh_icon(mesh)
 
     def _mesh_removed_cb(self, model):
-        self._remove_mesh_icon()
+        self._remove_mesh()
 
     def _buddy_added_cb(self, model, buddy_model):
         self._add_alone_buddy(buddy_model)
@@ -270,7 +270,7 @@ class MeshBox(SpreadBox):
         self._mesh = MeshDeviceView(mesh)
         self.add_item(self._mesh)
 
-    def _remove_access_point(self):
+    def _remove_mesh(self):
         if not self._mesh:
             return
         self.remove_item(self._mesh)