Wait for all kicker containers to load before sending desktop size to kdesktop

This resolves a long standing bug where icons would not stay put across logout / login cycles
Properly handle desktop area changes when align to grid is enabled

1 files changed, 6 insertions, 2 deletions

diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 45ae1e8e5..b3893c029 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -346,7 +346,8 @@ void KDesktop::slotNoKicker()
     kdDebug(1204) << "KDesktop::slotNoKicker ... kicker did not respond" << endl;
     // up till now, we got no desktopIconsArea from kicker - probably
     // it's not running, so use the area from KWinModule
-    m_pIconView->updateWorkArea(twinModule()->workArea(twinModule()->currentDesktop()));
+    TQRect area = twinModule()->workArea(twinModule()->currentDesktop());
+    m_pIconView->updateWorkArea(area);
 }
 
 void
@@ -908,8 +909,9 @@ void KDesktop::desktopIconsAreaChanged(const TQRect &area, int screen)
 
     // This is pretty broken, mixes Xinerama and non-Xinerama multihead
     // and generally doesn't seem to be required anyway => ignore screen.
-    if ( /*(screen == kdesktop_screen_number) &&*/ m_pIconView )
+    if ( /*(screen == kdesktop_screen_number) &&*/ m_pIconView ) {
         m_pIconView->updateWorkArea(area);
+    }
 }
 
 void KDesktop::slotSwitchDesktops(int delta)
@@ -1120,7 +1122,9 @@ void KDesktop::desktopResized()
             res >> area;
         }
         else
+        {
             area = twinModule()->workArea(twinModule()->currentDesktop());
+        }
 
         m_pIconView->updateWorkArea(area);
         m_pIconView->startDirLister();