diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-24 14:19:02 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-24 14:19:02 -0300 |
| commit | 8f849704c65ed0c4e61a5fb49e1909d7b3b0d684 (patch) | |
| tree | 0b3a4c81cf59a087fa0708ea24537ad272f0f984 /src/leap/bitmask/gui/preferenceswindow.py | |
| parent | 2cb7443595a91857a4d037f2385ade5c8385d6a4 (diff) | |
| parent | 4756aee1aa279bbce951b715a84dbb3d2f8d3173 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/4986_error-joining-string' into develop
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 |