diff options
| author | Kali Kaneko <kali@leap.se> | 2014-04-09 16:24:12 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-04-09 16:24:12 -0500 |
| commit | cf9fb29fd1098f694974ee60e5673f22e286d859 (patch) | |
| tree | 5cdc4210b8c944ee4f2669fd8096998d507beda3 /src/leap/bitmask/gui/preferenceswindow.py | |
| parent | f0232265a2725d8129b472479dd380b9ec3ca6b2 (diff) | |
| parent | 81715dc47d77934c4f67d2527a56c28f58f0345d (diff) | |
Merge tag '0.5.0' into deb-0.5.0
Tag leap.bitmask version 0.5.0
Conflicts:
pkg/requirements.pip
Diffstat (limited to 'src/leap/bitmask/gui/preferenceswindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/preferenceswindow.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/leap/bitmask/gui/preferenceswindow.py b/src/leap/bitmask/gui/preferenceswindow.py index 517a90c4..b2cc2236 100644 --- a/src/leap/bitmask/gui/preferenceswindow.py +++ b/src/leap/bitmask/gui/preferenceswindow.py @@ -18,7 +18,6 @@ """ Preferences window """ -import os import logging from functools import partial @@ -26,6 +25,7 @@ from functools import partial from PySide import QtCore, QtGui from zope.proxy import sameProxiedObjects +from leap.bitmask.provider import get_provider_path from leap.bitmask.config.leapsettings import LeapSettings from leap.bitmask.gui.ui_preferences import Ui_Preferences from leap.soledad.client import NoStorageSecret @@ -383,10 +383,7 @@ class PreferencesWindow(QtGui.QDialog): :rtype: ProviderConfig or None if there is a problem loading the config """ provider_config = ProviderConfig() - provider_config_path = os.path.join( - "leap", "providers", domain, "provider.json") - - if not provider_config.load(provider_config_path): + if not provider_config.load(get_provider_path(domain)): provider_config = None return provider_config |