diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-22 12:30:50 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-22 12:30:50 (GMT) |
| commit | d5185f7ed4464959beed10ab30a1bc10eb9b0d36 (patch) | |
| tree | 6ae9136364d4615a22dc96bea1a3bf5e04b05b10 /src | |
| parent | ea4823532e40e3d9afcd5f51f1ce8059e4edd131 (diff) | |
Fix connection counter.
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/model/network.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index f64ff08..21047c5 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -42,6 +42,7 @@ NM_CONNECTION_IFACE = 'org.freedesktop.NetworkManagerSettings.Connection' NM_SECRETS_IFACE = 'org.freedesktop.NetworkManagerSettings.Connection.Secrets' _nm_settings = None +_conn_counter = 0 class NMSettings(dbus.service.Object): def __init__(self): @@ -64,16 +65,12 @@ class NMSettings(dbus.service.Object): self.NewConnection(conn.path) class NMSettingsConnection(dbus.service.Object): - _counter = 0 - - def __init__(self, settings, secrets): - self.path = NM_SETTINGS_PATH + '/' + str(self._counter) - self._counter += 1 - + def __init__(self, path, settings, secrets): bus = dbus.SystemBus() bus_name = dbus.service.BusName(SETTINGS_SERVICE, bus=bus) - dbus.service.Object.__init__(self, bus_name, self.path) + dbus.service.Object.__init__(self, bus_name, path) + self.path = path self.secrets_request = dispatch.Signal() self._settings = settings @@ -106,8 +103,12 @@ def find_connection(ssid): return None def add_connection(ssid, settings, secrets=None): + global _conn_counter + + path = NM_SETTINGS_PATH + '/' + str(_conn_counter) + _conn_counter += 1 - conn = NMSettingsConnection(settings, secrets) + conn = NMSettingsConnection(path, settings, secrets) _nm_settings.add_connection(ssid, conn) return conn |