[gnome-control-center/T20818: 23/54] user-accounts: allow empty/weak passwords

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit a37b1e37908d2a7375c3f340554ac9d337bd04c3
Author: Cosimo Cecchi <cosimo endlessm com>
Date:   Tue May 6 14:03:10 2014 -0700

    user-accounts: allow empty/weak passwords

 panels/user-accounts/um-account-dialog.c  |    7 +++----
 panels/user-accounts/um-password-dialog.c |   10 ++++------
 2 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
index 9ca2c6d..caa65c7 100644
--- a/panels/user-accounts/um-account-dialog.c
+++ b/panels/user-accounts/um-account-dialog.c
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <act/act.h>
+#include <string.h>
 
 #include "um-account-dialog.h"
 #include "um-realm-manager.h"
@@ -304,7 +304,6 @@ local_validate (UmAccountDialog *self)
         const gchar *password;
         const gchar *verify;
         gchar *tip;
-        gint strength;
 
         name = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (self->local_username));
         valid_login = is_valid_username (name, &tip);
@@ -326,8 +325,8 @@ local_validate (UmAccountDialog *self)
         password = gtk_entry_get_text (GTK_ENTRY (self->local_password));
         verify = gtk_entry_get_text (GTK_ENTRY (self->local_verify));
         if (self->local_password_mode == ACT_USER_PASSWORD_MODE_REGULAR) {
-                strength = update_password_strength (self);
-                valid_password = strength > 1 && strcmp (password, verify) == 0;
+                update_password_strength (self);
+                valid_password = password && password[0] != '\0' && strcmp (password, verify) == 0;
         } else {
                 valid_password = TRUE;
         }
diff --git a/panels/user-accounts/um-password-dialog.c b/panels/user-accounts/um-password-dialog.c
index 0a142ed..64957d9 100644
--- a/panels/user-accounts/um-password-dialog.c
+++ b/panels/user-accounts/um-password-dialog.c
@@ -84,9 +84,8 @@ update_password_strength (UmPasswordDialog *um)
         gtk_level_bar_set_value (GTK_LEVEL_BAR (um->strength_indicator), strength_level);
         gtk_label_set_label (GTK_LABEL (um->password_hint), hint);
 
-        if (strength_level > 1) {
-                set_entry_validation_checkmark (GTK_ENTRY (um->password_entry));
-        } else if (strlen (password) == 0) {
+        set_entry_validation_checkmark (GTK_ENTRY (um->password_entry));
+        if (strlen (password) == 0) {
                 set_entry_generation_icon (GTK_ENTRY (um->password_entry));
         } else {
                 clear_entry_validation_error (GTK_ENTRY (um->password_entry));
@@ -223,14 +222,13 @@ update_sensitivity (UmPasswordDialog *um)
 {
         const gchar *password, *verify;
         gboolean can_change;
-        int strength;
 
         password = gtk_entry_get_text (GTK_ENTRY (um->password_entry));
         verify = gtk_entry_get_text (GTK_ENTRY (um->verify_entry));
 
         if (um->password_mode == ACT_USER_PASSWORD_MODE_REGULAR) {
-                strength = update_password_strength (um);
-                can_change = strength > 1 && strcmp (password, verify) == 0 &&
+                update_password_strength (um);
+                can_change = password && password[0] != '\0' && strcmp (password, verify) == 0 &&
                              (um->old_password_ok || !gtk_widget_get_visible (um->old_password_entry));
         }
         else {