From kde-commits  Sat Dec 28 02:01:35 2002
From: =?utf-8?q?Oswald=20Buddenhagen?= <ossi () kde ! org>
Date: Sat, 28 Dec 2002 02:01:35 +0000
To: kde-commits
Subject: KDE_3_1_BRANCH: kdebase/kdm/kfrontend
X-MARC-Message: https://marc.info/?l=kde-commits&m=104104092310524

CVS commit by ossi: 

- prevent <enter> in the user list from attempting a login; fixes #50043


  M +15 -17    kgreeter.cpp   1.83.2.1


--- kdebase/kdm/kfrontend/kgreeter.cpp  #1.83:1.83.2.1
@@ -113,4 +113,6 @@ KGreeter::KGreeter()
         insertUsers( user_view );
         main_grid->addMultiCellWidget(user_view, 0, 3, 0, 0);
+        connect( user_view, SIGNAL(clicked( QListViewItem * )),
+                 SLOT(slot_user_name( QListViewItem * )) );
     }
 
@@ -136,4 +138,8 @@ KGreeter::KGreeter()
     loginEdit = new KLoginLineEdit( winFrame );
     loginLabel = new QLabel( loginEdit, i18n("&Login:"), winFrame );
+    // update session type
+    connect( loginEdit, SIGNAL(lost_focus()), SLOT(sel_user()) );
+    // start login timeout after entered login
+    connect( loginEdit, SIGNAL(lost_focus()), SLOT(SetTimer()) );
 
     passwdEdit = new KPasswordEdit( winFrame, "edit", kdmcfg->_echoMode );
@@ -143,4 +149,7 @@ KGreeter::KGreeter()
     sessargLabel = new QLabel( sessargBox, i18n("Session &type:"), winFrame );
     sessargBox->insertStringList( kdmcfg->_sessionTypes );
+    // update sessargStat
+    connect( sessargBox, SIGNAL(activated(int)),
+             SLOT(slot_session_selected()) );
     sessargStat = new QWidget( winFrame );
     sasPrev = new QLabel( i18n("session type", "(previous)"), sessargStat );
@@ -239,17 +248,4 @@ KGreeter::KGreeter()
     // clear fields
     connect( timer, SIGNAL(timeout()), SLOT(timerDone()) );
-    // update session type
-    connect( loginEdit, SIGNAL(lost_focus()), SLOT(sel_user()) );
-    // start login timeout after entered login
-    connect( loginEdit, SIGNAL(lost_focus()), SLOT(SetTimer()) );
-    // update sessargStat
-    connect( sessargBox, SIGNAL(activated(int)),
-             SLOT(slot_session_selected()) );
-    if (user_view) {
-        connect( user_view, SIGNAL(returnPressed( QListViewItem * )),
-                 SLOT(slot_user_name( QListViewItem * )) );
-        connect( user_view, SIGNAL(clicked( QListViewItem * )),
-                 SLOT(slot_user_name( QListViewItem * )) );
-    }
 
     reject();
@@ -263,7 +259,7 @@ KGreeter::KGreeter()
         stsfile->deleteEntry( enam, false );
     if (kdmcfg->_preselUser != PRESEL_NONE) {
-        if (kdmcfg->_preselUser == PRESEL_PREV) {
+        if (kdmcfg->_preselUser == PRESEL_PREV)
             loginEdit->setText( stsfile->readEntry( enam ) );
-        } else
+        else
             loginEdit->setText( kdmcfg->_defaultUser );
         if (kdmcfg->_focusPasswd && !loginEdit->text().isEmpty())
@@ -699,5 +695,7 @@ KGreeter::accept()
 //      if (!verifyUser(false))
             passwdEdit->setFocus();
-    } else
+    } else if (user_view && user_view->hasFocus())
+        slot_user_name( user_view->currentItem() );
+    else
         verifyUser(true);
 }