aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ephy-password-dialog.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-02-26 04:38:15 +0800
committerChristian Persch <chpe@src.gnome.org>2008-02-26 04:38:15 +0800
commitf0c9a1218925074be201882b7eb41c3c5902bfda (patch)
treecf536add1cf3bda4da6049389a9ced5127e52f16 /lib/ephy-password-dialog.c
parentd21357e5d65e5e06710cdece80e66970f68cbd19 (diff)
downloadgsoc2013-epiphany-f0c9a1218925074be201882b7eb41c3c5902bfda.tar
gsoc2013-epiphany-f0c9a1218925074be201882b7eb41c3c5902bfda.tar.gz
gsoc2013-epiphany-f0c9a1218925074be201882b7eb41c3c5902bfda.tar.bz2
gsoc2013-epiphany-f0c9a1218925074be201882b7eb41c3c5902bfda.tar.lz
gsoc2013-epiphany-f0c9a1218925074be201882b7eb41c3c5902bfda.tar.xz
gsoc2013-epiphany-f0c9a1218925074be201882b7eb41c3c5902bfda.tar.zst
gsoc2013-epiphany-f0c9a1218925074be201882b7eb41c3c5902bfda.zip
Accept empty password to unlock a token; and allow empty new password if the requested password quality allows it. Bug #515096, patch by Thomas Wendt.
svn path=/trunk/; revision=7982
Diffstat (limited to 'lib/ephy-password-dialog.c')
-rw-r--r--lib/ephy-password-dialog.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/lib/ephy-password-dialog.c b/lib/ephy-password-dialog.c
index 72d6f7e22..660004a83 100644
--- a/lib/ephy-password-dialog.c
+++ b/lib/ephy-password-dialog.c
@@ -43,9 +43,8 @@ enum
{
CHECK_USER = 1 << 0,
CHECK_DOMAIN = 1 << 1,
- CHECK_PWD = 1 << 2,
- CHECK_PWD_MATCH = 1 << 3,
- CHECK_PWD_QUALITY = 1 << 4,
+ CHECK_PWD_MATCH = 1 << 2,
+ CHECK_PWD_QUALITY = 1 << 3,
CHECK_MASK = 0x1f
};
@@ -169,10 +168,6 @@ entry_changed_cb (GtkWidget *entry,
{
flag = CHECK_DOMAIN;
}
- else if (entry == priv->entry[PASSWORD_ENTRY])
- {
- flag = CHECK_PWD;
- }
text = gtk_entry_get_text (GTK_ENTRY (entry));
if (text != NULL && text[0] != '\0')
@@ -429,9 +424,7 @@ ephy_password_dialog_constructor (GType type,
_("_Password:"),
TRUE,
TRUE,
- G_CALLBACK (entry_changed_cb));
-
- priv->checks |= CHECK_PWD;
+ NULL);
}
if (priv->flags & EPHY_PASSWORD_DIALOG_FLAGS_SHOW_NEW_PASSWORD)
@@ -455,8 +448,6 @@ ephy_password_dialog_constructor (GType type,
TRUE,
TRUE,
G_CALLBACK (password_entry_changed_cb));
-
- priv->checks |= CHECK_PWD_MATCH;
}
if (priv->flags & (EPHY_PASSWORD_DIALOG_FLAGS_SHOW_PASSWORD |
@@ -481,7 +472,8 @@ ephy_password_dialog_constructor (GType type,
add_row (table, row++, _("Password quality:"), priv->quality_meter);
- priv->checks |= CHECK_PWD_QUALITY;
+ /* Update the quality meter now, so we allow empty new password if quality is 0. */
+ password_entry_changed_cb (priv->entry[NEW_PASSWORD_ENTRY], password_dialog);
}
/* Removed unused table rows */