Fixup tooltips. Still not working for the home page case, since

the active device logic is pretty broken.

2 files changed, 17 insertions, 2 deletions

diff --git a/shell/view/devices/wirelessnetwork.py b/shell/view/devices/wirelessnetwork.py
index 19eba5c..4a9e378 100644
--- a/shell/view/devices/wirelessnetwork.py
+++ b/shell/view/devices/wirelessnetwork.py
@@ -5,14 +5,21 @@ class DeviceView(deviceview.DeviceView):
         deviceview.DeviceView.__init__(self, model)
         self._model = model
 
+        model.connect('notify::name', self._name_changed_cb)
         model.connect('notify::strength', self._strength_changed_cb)
 
-        self.props.tooltip = model.get_name()
+        self._update_name()
         self._update_icon()
 
     def _strength_changed_cb(self, model, pspec):
         self._update_icon()
 
+    def _name_changed_cb(self, model, pspec):
+        self._update_name()
+
+    def _update_name(self):
+        self.props.tooltip = self._model.props.name
+
     def _update_icon(self):
         strength = self._model.props.strength
         if strength < 21:
diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py
index 6dcfb0c..7b5e5da 100644
--- a/shell/view/home/MeshBox.py
+++ b/shell/view/home/MeshBox.py
@@ -27,18 +27,23 @@ from view.BuddyIcon import BuddyIcon
 
 class AccessPointView(CanvasIcon):
     def __init__(self, model):
-        CanvasIcon.__init__(self, tooltip=model.get_name())
+        CanvasIcon.__init__(self)
         self._model = model
 
         self.connect('activated', self._activate_cb)
 
         model.connect('notify::strength', self._strength_changed_cb)
+        model.connect('notify::name', self._name_changed_cb)
 
         self._update_icon()
+        self._update_name()
 
     def _strength_changed_cb(self, model, pspec):
         self._update_icon()
 
+    def _name_changed_cb(self, model, pspec):
+        self._update_name()
+
     def _activate_cb(self, icon):
         network_manager = hardwaremanager.get_network_manager()
 
@@ -47,6 +52,9 @@ class AccessPointView(CanvasIcon):
 
         network_manager.set_active_device(device, network)
 
+    def _update_name(self):
+        self.props.tooltip = self._model.props.name
+
     def _update_icon(self):
         strength = self._model.props.strength
         if strength < 21: