Sophie

Sophie

distrib > Mandriva > cs4.0 > i586 > by-pkgid > 6f96ffda8b8309fb9c58db5e0ddbde2c > files > 46

kdebase-3.5.4-2.1.20060mlcs4.src.rpm

--- kdesktop/init.cc--	2005-04-12 05:06:54.402458282 -0400
+++ kdesktop/init.cc	2005-04-12 05:07:24.754599121 -0400
@@ -191,6 +191,7 @@ void testLocalInstallation()
 {
     const bool newRelease = isNewRelease();
 
+	testDir(KStandardDirs::mandriva_merge_directory());
     const QString desktopPath = realDesktopPath();
     const bool emptyDesktop = testDir( desktopPath );
 
--- kdesktop/kdiconview.cc--	2005-04-12 05:06:18.335291433 -0400
+++ kdesktop/kdiconview.cc	2005-04-12 05:06:33.035359370 -0400
@@ -118,6 +118,7 @@ KDIconView::KDIconView( QWidget *parent,
     setURL( desktopURL() ); // sets m_url
 
     m_desktopDirs = KGlobal::dirs()->findDirs( "appdata", "Desktop" );
+	m_desktopDirs.append(KStandardDirs::mandriva_merge_directory());
     initDotDirectories();
 
     connect( this, SIGNAL( executed( QIconViewItem * ) ),