diff options
| author | Kali Kaneko <kali@leap.se> | 2013-09-19 15:50:43 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-09-19 15:50:43 -0400 |
| commit | 1c194fe4b5d7b43097c31331cc8a7162bfbef4be (patch) | |
| tree | dd2f1e7901993208a00055e1f31595849d41eb51 /src/leap/bitmask/config/leapsettings.py | |
| parent | 006f362af526e9283c698805100e54c18b2be390 (diff) | |
| parent | 6cd19c3b67d76268bab5f93d3168164ec02f603d (diff) | |
Merge remote-tracking branch 'ivan-github/feature/standalone-flag-to-module' into develop
Diffstat (limited to 'src/leap/bitmask/config/leapsettings.py')
| -rw-r--r-- | src/leap/bitmask/config/leapsettings.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/leap/bitmask/config/leapsettings.py b/src/leap/bitmask/config/leapsettings.py index 7d8b5977..338fa475 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 import get_path_prefix +from leap.bitmask.util import get_path_prefix logger = logging.getLogger(__name__) @@ -71,15 +71,8 @@ class LeapSettings(object): # values GATEWAY_AUTOMATIC = "Automatic" - def __init__(self, standalone=False): - """ - Constructor - - :param standalone: parameter used to define the location of the config. - :type standalone: bool - """ - self._path_prefix = get_path_prefix(standalone=standalone) - settings_path = os.path.join(self._path_prefix, + def __init__(self): + settings_path = os.path.join(get_path_prefix(), "leap", self.CONFIG_NAME) self._settings = QtCore.QSettings(settings_path, @@ -132,7 +125,7 @@ class LeapSettings(object): # other things, not just the directories providers = [] try: - providers_path = os.path.join(self._path_prefix, + providers_path = os.path.join(get_path_prefix(), "leap", "providers") providers = os.listdir(providers_path) except Exception as e: |