diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-03-07 13:23:44 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-03-07 13:23:44 (GMT) |
| commit | eefad0aeedf7fe6bea68dd0f0e3b33db2b24b223 (patch) | |
| tree | a189253ced040de59794edf766fd7848d088d466 | |
| parent | ce6d21075f0732c23b180b9249e34d5466b8690a (diff) | |
Do not try to add access points on model removed signal!
Some fixes to access point state.
| -rw-r--r-- | shell/hardware/nmclient.py | 2 | ||||
| -rw-r--r-- | shell/model/accesspointmodel.py | 2 | ||||
| -rw-r--r-- | shell/view/home/MeshBox.py | 2 | ||||
| -rwxr-xr-x | tools/build-snapshot.sh | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/shell/hardware/nmclient.py b/shell/hardware/nmclient.py index 5d108a3..c0510b8 100644 --- a/shell/hardware/nmclient.py +++ b/shell/hardware/nmclient.py @@ -288,8 +288,10 @@ class Device(gobject.GObject): def set_active_network(self, network): if self._active_network == network: return + if self._active_network: self._active_network.disconnect(self._ssid_sid) + self._active_network.set_state(NETWORK_STATE_NOTCONNECTED) self._active_network = network diff --git a/shell/model/accesspointmodel.py b/shell/model/accesspointmodel.py index 02899c0..9762d2c 100644 --- a/shell/model/accesspointmodel.py +++ b/shell/model/accesspointmodel.py @@ -74,5 +74,5 @@ class AccessPointModel(gobject.GObject): elif pspec.name == 'name': return self._nm_network.get_ssid() elif pspec.name == 'state': - nm_state = self._nm_device.get_state() + nm_state = self._nm_network.get_state() return _nm_state_to_state[nm_state] diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py index c8d050c..df6b8ec 100644 --- a/shell/view/home/MeshBox.py +++ b/shell/view/home/MeshBox.py @@ -170,7 +170,7 @@ class MeshBox(SpreadBox): self._add_access_point(ap_model) def _access_point_removed_cb(self, model, ap_model): - self._add_access_point(ap_model) + self._remove_access_point(ap_model) def _add_alone_buddy(self, buddy_model): icon = BuddyIcon(self._shell, self._menu_shell, buddy_model) diff --git a/tools/build-snapshot.sh b/tools/build-snapshot.sh index cbcb656..717caee 100755 --- a/tools/build-snapshot.sh +++ b/tools/build-snapshot.sh @@ -1,6 +1,6 @@ VERSION=0.63 DATE=`date +%Y%m%d` -RELEASE=2.42 +RELEASE=2.44 TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2 rm sugar-$VERSION.tar.bz2 |