diff --git a/README.md b/README.md index fb9daec12..009b12f54 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ You are viewing the `0.16.x` branch (stable). |Development Stage|Branch|Version| Code Status| ----------------- | -------------- | -------------- | -------- | -|Cnchi Stable|0.16.x|![0.16.6](https://img.shields.io/github/release/antergos/cnchi.svg)|Frozen| +|Cnchi Stable|0.16.x|![0.16.7](https://img.shields.io/github/release/antergos/cnchi.svg)|Frozen| |Cnchi Development|0.17.x|![0.17.1](https://img.shields.io/github/release/antergos/cnchi/all.svg)|Development| |Cnchi Next (UI agnostic)|master|master|Development| diff --git a/src/info.py b/src/info.py index ed5a52cf7..1ff5fbad6 100755 --- a/src/info.py +++ b/src/info.py @@ -29,7 +29,7 @@ """ Set some Cnchi global constants """ -CNCHI_VERSION = "0.16.6" +CNCHI_VERSION = "0.16.7" """ Cnchi version """ CNCHI_WEBSITE = "http://www.antergos.com" diff --git a/src/misc/validation.py b/src/misc/validation.py index 846c737ac..b5288cd98 100644 --- a/src/misc/validation.py +++ b/src/misc/validation.py @@ -160,11 +160,19 @@ def human_password_strength(password): def check_password(password, verified_password, allow_empty=False): """ Check user password - This function expects dicts with Gtk widgets as parameters """ + This function expects Gtk widgets as parameters + + password['entry']: password entry + password['image']: password image (status) + password['label']: password label (status) + password['strength']: password strength + + verified_password: password confirm entry + """ complete = True passw = password['entry'].get_text() - vpassw = verified_password['entry'].get_text() + vpassw = verified_password.get_text() if passw != vpassw: complete = False password['image'].hide() diff --git a/src/pages/dialogs/luks_settings.py b/src/pages/dialogs/luks_settings.py index 16366689c..65b4bb323 100644 --- a/src/pages/dialogs/luks_settings.py +++ b/src/pages/dialogs/luks_settings.py @@ -218,12 +218,10 @@ def password_changed(self, _widget=None): """ User has introduced new information. Check it here. """ password = {} password['entry'] = self.gui.get_object('password_entry') - password['confirm'] = self.gui.get_object('password_confirm_entry') password['image'] = self.gui.get_object('password_confirm_image') - password['status'] = self.gui.get_object('password_status_label') + password['label'] = self.gui.get_object('password_status_label') password['strength'] = self.gui.get_object('password_strength') - validation.check_password( - password['entry'], password['confirm'], - password['image'], password['status'], - password['strength']) + verified_password = self.gui.get_object('password_confirm_entry') + + validation.check_password(password, verified_password) diff --git a/src/pages/user_info.py b/src/pages/user_info.py index d61ac33af..000e98692 100644 --- a/src/pages/user_info.py +++ b/src/pages/user_info.py @@ -410,7 +410,7 @@ def validate_password(self): """ Validates changed password entry """ validation.check_password( self.widgets['password'], - self.widgets['verified_password']) + self.widgets['verified_password']['entry']) def get_prev_page(self): """ Gets previous page """ diff --git a/update.info b/update.info index 844a39556..95bb713c9 100644 --- a/update.info +++ b/update.info @@ -1,2 +1,2 @@ -{"version":"0.16.6","files":[ +{"version":"0.16.7","files":[ ]}