sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Guillaume Desmottes 2007-03-07 15:27:57 +01:00
commit 9b52da2247
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/hardware/nmclient.py
View File

@ -288,8 +288,10 @@ class Device(gobject.GObject):
def set_active_network(self, network): def set_active_network(self, network):
if self._active_network == network: if self._active_network == network:
return return
if self._active_network: if self._active_network:
self._active_network.disconnect(self._ssid_sid) self._active_network.disconnect(self._ssid_sid)
self._active_network.set_state(NETWORK_STATE_NOTCONNECTED)
self._active_network = network self._active_network = network

2
shell/model/accesspointmodel.py
View File

@ -74,5 +74,5 @@ class AccessPointModel(gobject.GObject):
elif pspec.name == 'name': elif pspec.name == 'name':
return self._nm_network.get_ssid() return self._nm_network.get_ssid()
elif pspec.name == 'state': 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] return _nm_state_to_state[nm_state]

2
shell/view/home/MeshBox.py
View File

@ -170,7 +170,7 @@ class MeshBox(SpreadBox):
self._add_access_point(ap_model) self._add_access_point(ap_model)
def _access_point_removed_cb(self, model, 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): def _add_alone_buddy(self, buddy_model):
icon = BuddyIcon(self._shell, self._menu_shell, buddy_model) icon = BuddyIcon(self._shell, self._menu_shell, buddy_model)

2
tools/build-snapshot.sh
View File

@ -1,6 +1,6 @@
VERSION=0.63 VERSION=0.63
DATE=`date +%Y%m%d` DATE=`date +%Y%m%d`
RELEASE=2.42 RELEASE=2.44
TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2 TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2
rm sugar-$VERSION.tar.bz2 rm sugar-$VERSION.tar.bz2