[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE_3_1_BRANCH: kdebase/kdm/kfrontend
From: Oswald Buddenhagen <ossi () kde ! org>
Date: 2003-05-11 16:23:57
[Download RAW message or body]
CVS commit by ossi:
fix "kandalf's 1st bug": user icons not displayed any more.
1st rule of backporting: watch out for partial patches ... :}
M +7 -5 kgreeter.cpp 1.83.2.7
M +2 -2 kgreeter.h 1.23.2.3
--- kdebase/kdm/kfrontend/kgreeter.cpp #1.83.2.6:1.83.2.7
@@ -115,4 +115,7 @@ KGreeter::KGreeter()
, loginfailed( false )
{
+ user_pic_dir = KGlobal::dirs()->resourceDirs( "data" ).last() +
+ QString::fromLatin1("kdm/pics/users/"); /* XXX standardize */
+
QGridLayout* main_grid = new QGridLayout( winFrame, 4, 2, 10 );
QBoxLayout* hbox1 = new QHBoxLayout( 10 );
@@ -317,5 +320,5 @@ KGreeter::insertUser( UserListView *list
if (kdmcfg->_faceSource != FACE_USER_ONLY &&
kdmcfg->_faceSource != FACE_PREFER_USER)
- p = QPixmap( locate( "user_pic", username + ".png" ) );
+ p = QPixmap( user_pic_dir + username + ".png" );
if (p.isNull() && kdmcfg->_faceSource != FACE_ADMIN_ONLY) {
// XXX remove seteuid-voodoo when we run as nobody
@@ -325,5 +328,5 @@ KGreeter::insertUser( UserListView *list
}
if (p.isNull() && kdmcfg->_faceSource != FACE_USER_ONLY)
- p = QPixmap( locate( "user_pic", username + ".png" ) );
+ p = QPixmap( user_pic_dir + username + ".png" );
if (p.isNull())
p = default_pix;
@@ -343,6 +346,5 @@ void
KGreeter::insertUsers( UserListView *listview )
{
- QImage default_pix(
- locate( "user_pic", QString::fromLatin1("default.png") ) );
+ QImage default_pix( user_pic_dir + QString::fromLatin1("default.png") );
if (default_pix.isNull())
LogError("Can't open default pixmap \"default.png\"\n");
--- kdebase/kdm/kfrontend/kgreeter.h #1.23.2.2:1.23.2.3
@@ -122,5 +122,5 @@ private:
enum WmStat { WmNone, WmPrev, WmSel };
WmStat wmstat;
- QString enam;
+ QString enam, user_pic_dir;
KSimpleConfig *stsfile;
UserListView *user_view;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic