diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-05-21 19:17:09 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-05-21 19:17:09 -0300 |
| commit | e7cff9866e50f9730f8fc6ab70cf116ed38f7935 (patch) | |
| tree | 1fd1c072a004719bc101e74e63e7c8c7219cd1c2 /src/leap/bitmask/gui/preferenceswindow.py | |
| parent | 2ba353fbc87eb81dde2f169b8facdb2104107f70 (diff) | |
| parent | d0a9ecf0cba998b44a216c5cdf1800eea152f379 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/fix-username-regex-support' into develop
Diffstat (limited to 'src/leap/bitmask/gui/preferenceswindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/preferenceswindow.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/preferenceswindow.py b/src/leap/bitmask/gui/preferenceswindow.py index 47011a85..0a4c7f56 100644 --- a/src/leap/bitmask/gui/preferenceswindow.py +++ b/src/leap/bitmask/gui/preferenceswindow.py @@ -27,7 +27,7 @@ from PySide import QtCore, QtGui 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.bitmask.util.password import basic_password_checks +from leap.bitmask.util.credentials import password_checks from leap.bitmask.services import get_supported from leap.bitmask.config.providerconfig import ProviderConfig from leap.bitmask.services import get_service_display_name, MX_SERVICE @@ -198,7 +198,7 @@ class PreferencesWindow(QtGui.QDialog): new_password = self.ui.leNewPassword.text() new_password2 = self.ui.leNewPassword2.text() - ok, msg = basic_password_checks(username, new_password, new_password2) + ok, msg = password_checks(username, new_password, new_password2) if not ok: self._set_changing_password(False) |