Sophie

Sophie

distrib > Mandriva > 2006.0 > i586 > media > main-src > by-pkgid > a6bc312ce50b5c8d0c51736e58ac32bc > files > 320

kdebase-3.4.2-55mdk.src.rpm

--- kdebase-3.3.2/kdm/kfrontend/kgapp.cpp--	2005-01-22 14:48:06.213619484 +0100
+++ kdebase-3.3.2/kdm/kfrontend/kgapp.cpp	2005-01-22 14:49:11.173471555 +0100
@@ -138,7 +138,10 @@ kg_main( const char *argv0 )
     }
 
     app.setFont( _normalFont );
-
+	
+    KGlobal::dirs()->addResourceType( "user_pic",
+                     KStandardDirs::kde_default("data") +
+                     QString::fromLatin1("kdm/pics/users/") );	
     setup_modifiers( dpy, _numLockStatus );
     //SecureDisplay( dpy );
     KProcess *proc = 0;
--- kdebase-3.3.2/kdm/kfrontend/kgreeter.cpp--	2005-01-22 14:49:20.891197405 +0100
+++ kdebase-3.3.2/kdm/kfrontend/kgreeter.cpp	2005-01-22 14:50:56.233318832 +0100
@@ -184,7 +184,7 @@ KGreeter::insertUser( const QImage &defa
     do {
 	QString fn = dp ?
 		     QFile::decodeName( ps->pw_dir ) + "/.face" :
-		     _faceDir + '/' + username + ".face";
+				locate( "user_pic", username + ".png" );
 	if (p.load( fn + ".icon" ) || p.load( fn )) {
 	    QSize ns( 48, 48 );
 	    if (p.size() != ns)
@@ -250,7 +250,7 @@ KGreeter::insertUsers()
     QImage default_pix;
     if (userView) {
 	if (!default_pix.load( _faceDir + "/.default.face.icon" ))
-	    if (!default_pix.load( _faceDir + "/.default.face" ))
+		if (!default_pix.load(locate( "user_pic", QString::fromLatin1("default.png") )))
 		LogError("Can't open default user face\n");
 	QSize ns( 48, 48 );
 	if (default_pix.size() != ns)