Sophie

Sophie

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

kdebase-3.4.2-55mdk.src.rpm

--- kdebase/kdesktop/desktop.cc--	2004-09-01 13:54:21.781083847 +0200
+++ kdebase/kdesktop/desktop.cc	2004-09-01 14:32:05.707795039 +0200
@@ -104,7 +104,7 @@ void KRootWidget::setWheelSwitchEnabled(
 // for multihead - from main.cc
 extern int kdesktop_screen_number;
 
-KDesktop::KDesktop( bool x_root_hack, bool auto_start, bool wait_for_kded ) :
+KDesktop::KDesktop( bool x_root_hack, bool auto_start, bool wait_for_kded, bool newInstall ) :
     DCOPObject( "KDesktopIface" ),
     QWidget( 0L, "desktop", WResizeNoErase | ( x_root_hack ? (WStyle_Customize | WStyle_NoBorder) : 0) ),
     // those two WStyle_ break kdesktop when the root-hack isn't used (no Dnd)
@@ -174,6 +174,8 @@ KDesktop::KDesktop( bool x_root_hack, bo
 #if (QT_VERSION-0 >= 0x030200) // XRANDR support
   connect( kapp->desktop(), SIGNAL( resized( int )), SLOT( desktopResized()));
 #endif
+  if( newInstall )
+    if( m_pIconView ) m_pIconView->lineupIcons(QIconView::TopToBottom);
 }
 
 void
--- kdebase/kdesktop/desktop.h--	2004-09-01 13:54:24.777126522 +0200
+++ kdebase/kdesktop/desktop.h	2004-09-01 14:27:46.963001471 +0200
@@ -60,7 +60,7 @@ class KDesktop : public QWidget, virtual
   Q_OBJECT
 public:
 
-  KDesktop(bool x_root_hack, bool auto_start, bool wait_for_kded );
+  KDesktop(bool x_root_hack, bool auto_start, bool wait_for_kded, bool newInstall = false );
   ~KDesktop();
 
   // Implementation of the DCOP interface
--- kdebase/kdesktop/init.cc--	2004-09-01 13:52:52.317816710 +0200
+++ kdebase/kdesktop/init.cc	2004-09-01 13:53:38.654471257 +0200
@@ -154,7 +154,7 @@ bool isNewRelease()
  * copy default .directory files there, as well as templates files.
  * Called by kdesktop on startup.
  */
-void testLocalInstallation()
+bool testLocalInstallation()
 {
     bool newRelease = isNewRelease();
 
@@ -208,6 +208,6 @@ void testLocalInstallation()
     testDir( KGlobalSettings::autostartPath() );
     // we force the copying in case of a new release, to install new translations....
     copyDirectoryFile("directory.autostart", KGlobalSettings::autostartPath(), newRelease);
-
+    return emptyDesktop;
 }
 
--- kdebase/kdesktop/init.h--	2004-09-01 13:52:54.999854491 +0200
+++ kdebase/kdesktop/init.h	2004-09-01 13:53:14.162124801 +0200
@@ -25,6 +25,6 @@
  * copy default .directory files there, as well as templates files.
  * Called by kdesktop on startup.
  */
-void testLocalInstallation();
+bool testLocalInstallation();
 
 #endif
--- kdebase/kdesktop/main.cc--	2004-09-01 13:52:45.541721319 +0200
+++ kdebase/kdesktop/main.cc	2004-09-01 13:54:10.539923866 +0200
@@ -167,7 +167,7 @@ extern "C" int kdemain( int argc, char *
     // Do this before forking so that if a dialog box appears it won't
     // be covered by other apps.
     // And before creating KDesktop too, of course.
-    testLocalInstallation();
+    bool newInstall = testLocalInstallation();
 
     // Mark kdeskop as immutable if all of its config modules have been disabled
     if (!app.config()->isImmutable() && 
@@ -180,7 +180,7 @@ extern "C" int kdemain( int argc, char *
     // Open-with dialog handler
     KFileOpenWithHandler fowh;
 
-    KDesktop desktop( x_root_hack, auto_start, wait_for_kded );
+    KDesktop desktop( x_root_hack, auto_start, wait_for_kded, newInstall );
 
     args->clear();