epiphany r7982 - trunk/lib

[chpe svn gnome org]

Author: chpe
Date: Mon Feb 25 20:38:15 2008
New Revision: 7982
URL: http://svn.gnome.org/viewvc/epiphany?rev=7982&view=rev

Log:
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.


Modified:
   trunk/lib/ephy-password-dialog.c

Modified: trunk/lib/ephy-password-dialog.c
==============================================================================
--- trunk/lib/ephy-password-dialog.c	(original)
+++ trunk/lib/ephy-password-dialog.c	Mon Feb 25 20:38:15 2008
@@ -43,9 +43,8 @@
 {
 	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 @@
 	{
 		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 @@
 				   _("_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 @@
 				   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 @@
 
 		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 */