From e50e704364ca78ddc9233f516032552838236de9 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <silbe@activitycentral.com>
Date: Tue, 18 Oct 2011 15:46:18 +0000
Subject: Revert "Don't break if we may not own NetworkManagerUserSettings"

This reverts commit ce2745c8cd3b0b8aaadd0a9900fb74df16eb619a that got pushed
by accident.
---
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
 
--
cgit v0.9.1