diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-04-05 04:22:13 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-04-05 04:22:13 (GMT) |
| commit | 396ca0e64ea40fdaade2dfc4a13028dfc0a4f89b (patch) | |
| tree | 6b998d263430ceabf57977799c9200be3ae14458 /shell | |
| parent | 7a2a480850ed1e941c8b98d29ed99de54a3ac354 (diff) | |
Don't hiccup on NM start/stop
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/model/devices/devicesmodel.py | 3 | ||||
| -rw-r--r-- | shell/view/home/MeshBox.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/shell/model/devices/devicesmodel.py b/shell/model/devices/devicesmodel.py index 4a2148c..8b0dc9d 100644 --- a/shell/model/devices/devicesmodel.py +++ b/shell/model/devices/devicesmodel.py @@ -75,7 +75,8 @@ class DevicesModel(gobject.GObject): pass def _network_device_removed_cb(self, network_manager, nm_device): - self.remove_device(self._get_network_device(nm_device)) + if self._devices.has_key(str(nm_device.get_op())): + self.remove_device(self._get_network_device(nm_device)) def _check_network_device(self, nm_device): if not nm_device.is_valid(): 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) |