From 4299dd67657d03a6312ae33e00023e6f07ac45d8 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 25 Feb 2007 17:51:30 +0100 Subject: [PATCH] Cleanups --- shell/hardware/nmclient.py | 3 --- shell/model/devices/wirelessnetwork.py | 9 ++------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/shell/hardware/nmclient.py b/shell/hardware/nmclient.py index 8eaab2f9..e100a1fb 100644 --- a/shell/hardware/nmclient.py +++ b/shell/hardware/nmclient.py @@ -145,8 +145,6 @@ class Device(gobject.GObject): 'strength-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), - 'essid-changed': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, ([])), 'network-appeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), @@ -278,7 +276,6 @@ class Device(gobject.GObject): for (op, net) in self._networks.items(): if net.get_ssid() == ssid: self._active_net = op - self.emit('essid-changed') def get_type(self): return self._type diff --git a/shell/model/devices/wirelessnetwork.py b/shell/model/devices/wirelessnetwork.py index 45bc5fe5..a3648274 100644 --- a/shell/model/devices/wirelessnetwork.py +++ b/shell/model/devices/wirelessnetwork.py @@ -16,8 +16,6 @@ class Device(device.Device): self._nm_device.connect('strength-changed', self._strength_changed_cb) - self._nm_device.connect('essid-changed', - self._essid_changed_cb) def _strength_changed_cb(self, nm_device, strength): self.notify('strength') @@ -29,11 +27,8 @@ class Device(device.Device): if pspec.name == 'strength': return self._nm_device.get_strength() elif pspec.name == 'name': - active_net = self._nm_device.get_active_network() - if active_net: - return active_net.get_ssid() - else: - return None + # FIXME + return None def get_type(self): return 'wirelessnetwork'