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

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
 

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]

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)

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