summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/feature-3574_use-dirspec-instead-of-plain-xdg1
-rw-r--r--src/leap/bitmask/config/leapsettings.py9
2 files changed, 5 insertions, 5 deletions
diff --git a/changes/feature-3574_use-dirspec-instead-of-plain-xdg b/changes/feature-3574_use-dirspec-instead-of-plain-xdg
new file mode 100644
index 00000000..9bdc5071
--- /dev/null
+++ b/changes/feature-3574_use-dirspec-instead-of-plain-xdg
@@ -0,0 +1 @@
+ o Use dirspec instead of plain xdg. Closes #3574.
diff --git a/src/leap/bitmask/config/leapsettings.py b/src/leap/bitmask/config/leapsettings.py
index c1fabd9c..ca94129e 100644
--- a/src/leap/bitmask/config/leapsettings.py
+++ b/src/leap/bitmask/config/leapsettings.py
@@ -24,7 +24,7 @@ import logging
from PySide import QtCore
from leap.common.check import leap_assert, leap_assert_type
-from leap.common.config.prefixers import get_platform_prefixer
+from leap.common.config import get_path_prefix
logger = logging.getLogger(__name__)
@@ -75,10 +75,9 @@ class LeapSettings(object):
the config
:type standalone: bool
"""
- self._path_prefix = get_platform_prefixer().get_path_prefix(
- standalone=standalone)
settings_path = os.path.join(
- self._path_prefix, "leap", self.CONFIG_NAME)
+ get_path_prefix(standalone=standalone), "leap", self.CONFIG_NAME)
+
self._settings = QtCore.QSettings(settings_path,
QtCore.QSettings.IniFormat)
@@ -130,7 +129,7 @@ class LeapSettings(object):
providers = []
try:
providers_path = os.path.join(
- self._path_prefix, "leap", "providers")
+ get_path_prefix(), "leap", "providers")
providers = os.listdir(providers_path)
except Exception as e:
logger.debug("Error listing providers, assume there are none. %r"