diff options
| -rw-r--r-- | src/jarabe/desktop/meshbox.py | 2 | ||||
| -rw-r--r-- | src/jarabe/model/network.py | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index 31f2b67..6d5bb48 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -321,7 +321,7 @@ class NetworkManagerObserver(object): dbus_interface=_NM_IFACE) settings = network.get_settings() - if not isinstance(settings, network.DummyNMSettings): + if settings is not None: settings.secrets_request.connect(self.__secrets_request_cb) def __secrets_request_cb(self, **kwargs): diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index e55322b..f265ae4 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -535,17 +535,6 @@ class NMSettings(dbus.service.Object): self.connections.pop(uuid) -class DummyNMSettings(object): - """ - Dummy object used when we don't own the NetworkManager user settings. - """ - - connections = {} - - def clear_wifi_connections(self): - logging.debug('DummyNMSettings.clear_wifi_connections called') - - class SecretsResponse(object): """Intermediate object to report the secrets from the dialog back to the connection object and which will inform NM @@ -826,8 +815,6 @@ def get_settings(): _nm_settings = NMSettings() except dbus.DBusException: logging.exception('Cannot create the UserSettings service.') - _nm_settings = DummyNMSettings() - load_connections() return _nm_settings |