[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kdesktop
From:       David Faure <faure () kde ! org>
Date:       2005-01-30 19:52:59
Message-ID: 20050130195259.37FD61BBC5 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Also create trash.desktop when we just created the Desktop dir, of course.
Thanks to Stephan Binner for noticing this omission.
BUG: 98007


  M +4 -4      init.cc   1.35


--- kdebase/kdesktop/init.cc  #1.34:1.35
@@ -190,8 +190,8 @@ static bool isNewRelease()
 void testLocalInstallation()
 {
-    bool newRelease = isNewRelease();
+    const bool newRelease = isNewRelease();
 
-    QString desktopPath = realDesktopPath();
-    bool emptyDesktop = testDir( desktopPath );
+    const QString desktopPath = realDesktopPath();
+    const bool emptyDesktop = testDir( desktopPath );
 
     // Do not force copying that one (it would lose the icon positions)
@@ -211,5 +211,5 @@ void testLocalInstallation()
     const bool trashDesktopExists = QFile::exists( trashDesktopPath );
     const bool installNewTrashi18n = newRelease && trashDesktopExists; // not if deleted by user
-    if ( firstTimeWithNewTrash || installNewTrashi18n ) {
+    if ( emptyDesktop || firstTimeWithNewTrash || installNewTrashi18n ) {
         QString oldIcon, oldEmptyIcon;
         if ( trashDesktopExists ) {


[prev in list] [next in list] [prev in thread] [next in thread]