diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-28 15:54:55 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-28 15:54:55 -0300 |
| commit | 37363c9700c245623d9c7f50ccbdfe1b9482eafe (patch) | |
| tree | d877444d9eb9fdb3c61a1c05cc4383a04b997216 | |
| parent | 8a94537a66275950d6b9fb986ca1ae3970fd9232 (diff) | |
| parent | 3b12583c01976025a18caef8ef4bdccae9e92549 (diff) | |
Merge remote-tracking branch 'ivan/feature/3574_use-dirspec-instead-of-xdg' into develop
Conflicts:
src/leap/bitmask/config/leapsettings.py
| -rw-r--r-- | changes/feature-3574_use-dirspec-instead-of-plain-xdg | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/config/leapsettings.py | 7 |
2 files changed, 4 insertions, 4 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..4604b807 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) |