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

Cleanups

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-02-25 17:51:30 +01:00
parent 66f26e4b8b
commit 4299dd6765
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shell/hardware/nmclient.py
View File

@ -145,8 +145,6 @@ class Device(gobject.GObject):
'strength-changed': (gobject.SIGNAL_RUN_FIRST, 'strength-changed': (gobject.SIGNAL_RUN_FIRST,
gobject.TYPE_NONE, gobject.TYPE_NONE,
([gobject.TYPE_PYOBJECT])), ([gobject.TYPE_PYOBJECT])),
'essid-changed': (gobject.SIGNAL_RUN_FIRST,
gobject.TYPE_NONE, ([])),
'network-appeared': (gobject.SIGNAL_RUN_FIRST, 'network-appeared': (gobject.SIGNAL_RUN_FIRST,
gobject.TYPE_NONE, gobject.TYPE_NONE,
([gobject.TYPE_PYOBJECT])), ([gobject.TYPE_PYOBJECT])),
@ -278,7 +276,6 @@ class Device(gobject.GObject):
for (op, net) in self._networks.items(): for (op, net) in self._networks.items():
if net.get_ssid() == ssid: if net.get_ssid() == ssid:
self._active_net = op self._active_net = op
self.emit('essid-changed')
def get_type(self): def get_type(self):
return self._type return self._type

7
shell/model/devices/wirelessnetwork.py
View File

@ -16,8 +16,6 @@ class Device(device.Device):
self._nm_device.connect('strength-changed', self._nm_device.connect('strength-changed',
self._strength_changed_cb) self._strength_changed_cb)
self._nm_device.connect('essid-changed',
self._essid_changed_cb)
def _strength_changed_cb(self, nm_device, strength): def _strength_changed_cb(self, nm_device, strength):
self.notify('strength') self.notify('strength')
@ -29,10 +27,7 @@ class Device(device.Device):
if pspec.name == 'strength': if pspec.name == 'strength':
return self._nm_device.get_strength() return self._nm_device.get_strength()
elif pspec.name == 'name': elif pspec.name == 'name':
active_net = self._nm_device.get_active_network() # FIXME
if active_net:
return active_net.get_ssid()
else:
return None return None
def get_type(self): def get_type(self):