Sophie

Sophie

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

kdebase-3.4.2-55mdk.src.rpm

--- kdebase-3.3.0/kdesktop/init.cc--	2004-09-06 05:41:46.225976386 -0400
+++ kdebase-3.3.0/kdesktop/init.cc	2004-09-06 05:42:33.661990334 -0400
@@ -186,14 +186,14 @@ bool testLocalInstallation()
 	trashPath.replace("Desktop", dn);
     }
 
-    testDir( trashPath );
+    bool trashExist = testDir( trashPath );
     copyDirectoryFile("directory.trash", trashPath, newRelease); // for trash icon
 
     QString directoryPath = desktopPath+"/.directory";
     QDir directoryTrash( desktopPath );
     QDir tmpTrash( trashPath );
     //kdDebug()<<"directoryPath :"<<directoryPath<<endl;
-    if(directoryTrash.exists() )
+    if( trashExist && directoryTrash.exists() )
       {
 	//kdDebug()<<" directory trash exist !!!!!!!!!!!!!\n";
 	KSimpleConfig *conf = new KSimpleConfig( directoryPath );