fixes for bug #11210

[wifi-assistant] / package / src / wifi_assistant / settings / application_settings.py

diff --git a/package/src/wifi_assistant/settings/application_settings.py b/package/src/wifi_assistant/settings/application_settings.py
index ff161a2..e4d7c0f 100644 (file)
--- a/package/src/wifi_assistant/settings/application_settings.py
+++ b/package/src/wifi_assistant/settings/application_settings.py
@@ -3,7 +3,7 @@ from gnome import gconf
 
 class ApplicationSettings():
     
-    def __init__(self, gconf_client, gconf_root_dir='/apps/maemo/wifi-assistant'):
+    def __init__(self, gconf_client, gconf_root_dir):
         self._gc = gconf_client
         self._gconfRootDir = gconf_root_dir
         self._gconfPopupKey = gconf_root_dir + '/daemon'
@@ -34,7 +34,11 @@ class ApplicationSettings():
     def getUsePopup(self):
         """Tells whether to use the daemon or not."""
         
-        return self._gc.get_bool(self._gconfPopupKey) is True
+        value = self._gc.get_without_default(self._gconfPopupKey)
+        if value is None:
+            self.setUsePopup(True)
+            return True
+        return value.get_bool() is not False
 
 
     def setUsePopup(self, mode):