--- kdebase-3.3.2/kcontrol/kdm/kdm-users.cpp-- 2005-01-22 14:53:17.591877383 +0100 +++ kdebase-3.3.2/kcontrol/kdm/kdm-users.cpp 2005-01-22 14:54:47.733610375 +0100 @@ -74,7 +74,7 @@ KDMUsersWidget::KDMUsersWidget(QWidget * // We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users, // and create them if necessary. config->setGroup( "X-*-Greeter" ); - m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; + m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/pics/users/" ) + '/'; m_notFirst = false; QDir testDir( m_userPixDir ); if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() ) @@ -256,10 +256,10 @@ void KDMUsersWidget::slotUserSelected() QString user = usercombo->currentText(); QImage p; if (user != m_defaultText && - p.load( m_userPixDir + user + ".face.icon" )) { + p.load( m_userPixDir + user + ".png" )) { rstuserbutton->setEnabled( !getuid() ); } else { - p.load( m_userPixDir + ".default.face.icon" ); + p.load( m_userPixDir + "default.png" ); rstuserbutton->setEnabled( false ); } userbutton->setPixmap( p.smoothScale( 48, 48, QImage::ScaleMin ) ); @@ -286,7 +286,7 @@ void KDMUsersWidget::changeUserPix(const } p = p.smoothScale( 48, 48, QImage::ScaleMin ); - QString userpix = m_userPixDir + user + ".face.icon"; + QString userpix = m_userPixDir + user + ".png"; if (!p.save( userpix, "PNG" )) KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1") @@ -316,7 +316,7 @@ void KDMUsersWidget::slotUserButtonClick void KDMUsersWidget::slotUnsetUserPix() { - QFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" ); + QFile::remove( m_userPixDir + usercombo->currentText() + ".png" ); slotUserSelected(); }