[PC-BSD Commits] r21576 - pcbsd-projects/PCDM

[svn at pcbsd.org]

Author: kenmoore
Date: 2013-02-16 02:21:48 +0000 (Sat, 16 Feb 2013)
New Revision: 21576

Modified:
   pcbsd-projects/PCDM/loginWidget.cpp
   pcbsd-projects/PCDM/pcdm-gui.cpp
   pcbsd-projects/PCDM/pcdm-gui.h
Log:
Fix the PCDM crash on a failed login attempt. It was actaully trying to change an old widget that no longer existed



Modified: pcbsd-projects/PCDM/loginWidget.cpp
===================================================================
--- pcbsd-projects/PCDM/loginWidget.cpp	2013-02-16 02:15:06 UTC (rev 21575)
+++ pcbsd-projects/PCDM/loginWidget.cpp	2013-02-16 02:21:48 UTC (rev 21576)
@@ -111,6 +111,7 @@
   QString user = listUsers->currentText();
   QString pw = linePassword->text();
   emit loginRequested(user,pw);
+  linePassword->setText(""); //always clear the box after a login attempt
 }
 
 void LoginWidget::slotChooseUser(int i){

Modified: pcbsd-projects/PCDM/pcdm-gui.cpp
===================================================================
--- pcbsd-projects/PCDM/pcdm-gui.cpp	2013-02-16 02:15:06 UTC (rev 21575)
+++ pcbsd-projects/PCDM/pcdm-gui.cpp	2013-02-16 02:21:48 UTC (rev 21576)
@@ -218,27 +218,22 @@
   toolbar->setEnabled(FALSE);
   //Try to login
   bool success = Backend::startUserLogin(username, password, binary); 
-  qDebug() << "Login Status:" << success;
   if(success){
-    qDebug() << "Starting Login process";
     emit xUserFound(username);
     emit xCmdFound(binary);
     emit xHomeFound( Backend::getUserHomeDir(username) );
     emit xSessionStart(); //start the desktop environment
     slotClosePCDM(); //now start to close down the PCDM GUI
   }else{
-    qDebug() << "Failed Login Attempt";
-    pwline->setText("");
     //Display an info box that the login failed
     QMessageBox notice(this);
-    //notice.setWindowTitle(tr("Invalid Username/Password"));
+    notice.setWindowTitle(tr("Invalid Username/Password"));
     notice.setIcon(QMessageBox::Warning);
     notice.setText(tr("Username/Password combination is invalid, please try again."));
     notice.setInformativeText("("+tr("Tip: Make sure that caps-lock is turned off.")+")");
     notice.setStandardButtons(QMessageBox::Ok);
     notice.setDefaultButton(QMessageBox::Ok);
     notice.exec();
-    qDebug() << "Notification box Finished";
   }
   //Re-Enable user input
   loginW->setEnabled(TRUE);

Modified: pcbsd-projects/PCDM/pcdm-gui.h
===================================================================
--- pcbsd-projects/PCDM/pcdm-gui.h	2013-02-16 02:15:06 UTC (rev 21575)
+++ pcbsd-projects/PCDM/pcdm-gui.h	2013-02-16 02:21:48 UTC (rev 21576)
@@ -56,9 +56,8 @@
     QAction *virtkeyboardButton, *localeButton, *keyboardButton;
     QToolButton *systemButton;
     QMenu* systemMenu;
-    QComboBox* unameline;
     FancySwitcher* deSwitcher;
-    QLineEdit* pwline;
+
     //QX11EmbedContainer* container;
     QProcess* vkbd;
     ThemeStruct* currentTheme;