[PC-BSD Commits] r539 - pcbsd/trunk/PCInstall

svn at pcbsd.org svn at pcbsd.org
Thu Jul 19 10:10:53 PDT 2007


Author: tim
Date: 2007-07-19 18:10:53 +0100 (Thu, 19 Jul 2007)
New Revision: 539

Modified:
   pcbsd/trunk/PCInstall/pcinstall.ui.h
Log:
Don't mention non-matching passwords at all until the user has finished entering them

Modified: pcbsd/trunk/PCInstall/pcinstall.ui.h
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui.h	2007-07-19 16:32:49 UTC (rev 538)
+++ pcbsd/trunk/PCInstall/pcinstall.ui.h	2007-07-19 17:10:53 UTC (rev 539)
@@ -469,9 +469,8 @@
 	linePassword->setPaletteBackgroundColor(colourRed);
 	ok = 1;
     }
-    if (linePassword->text() != linePassword2->text() && ! linePassword->text().isEmpty() && ! linePassword2->text().isEmpty() )
+    if ((linePassword->text() != linePassword2->text()) || linePassword->text().isEmpty())
     {
-	textAcctNotify->setText(tr("Root passwords must match to continue."));
 	ok = 1;
     }
     
@@ -2323,9 +2322,8 @@
 
     
     
-    if ( lineUserPassword->text() != lineUserPassword2->text() && ! lineUserPassword->text().isEmpty() && ! lineUserPassword2->text().isEmpty() )
+    if ( (lineUserPassword->text() != lineUserPassword2->text()) || lineUserPassword->text().isEmpty())
     {
-	textAcctNotify->setText(tr("Error: User passwords do not match!"));
 	ok = FALSE;
     }
     
@@ -3126,6 +3124,7 @@
     {
 	lineUserPassword->setPaletteBackgroundColor(colourRed);
 	lineUserPassword2->setPaletteBackgroundColor(colourRed);
+	textAcctNotify->setText(tr("Error: User passwords do not match!"));
     }
     else
     {



More information about the Commits mailing list