diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-23 10:08:41 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-23 10:08:41 (GMT) |
| commit | 4847b46cd3929ee983876d98e79003c74dd94097 (patch) | |
| tree | 2f9685500cb277763211ccd1b5a3d2cef9a46dba /src | |
| parent | a0252b42f434b4357a1aec27094da9a9994ef9c9 (diff) | |
Do not crash in we can't own UserSettings because of
missing system policies for the service.
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/desktop/meshbox.py | 3 | ||||
| -rw-r--r-- | src/jarabe/model/network.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index c4fb11f..30fcf0c 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -536,7 +536,8 @@ class NetworkManagerObserver(object): dbus_interface=_NM_DEVICE_IFACE) settings = network.get_settings() - settings.secrets_request.connect(self.__secrets_request_cb) + if settings: + settings.secrets_request.connect(self.__secrets_request_cb) def __secrets_request_cb(self, **kwargs): # FIXME It would be better to do all of this async, but I cannot think diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index a7a6bd1..791a3ea 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -108,7 +108,10 @@ class NMSettingsConnection(dbus.service.Object): def get_settings(): global _nm_settings if _nm_settings is None: - _nm_settings = NMSettings() + try: + _nm_settings = NMSettings() + except dbus.DBusException, e: + logging.error('Cannot create the UserSettings service %s.', e) return _nm_settings def find_connection(ssid): |