From kde-commits  Wed Mar 31 21:28:15 2010
From: Marco Martin <notmart () gmail ! com>
Date: Wed, 31 Mar 2010 21:28:15 +0000
To: kde-commits
Subject: branches/KDE/4.4/kdebase/workspace/plasma/netbook/shell
Message-Id: <20100331212815.C0925AC888 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=127007083531563

SVN commit 1109721 by mart:

backport fix to first config file restore: assign the screen to the configured containment


 M  +3 -2      plasmaapp.cpp  


--- branches/KDE/4.4/kdebase/workspace/plasma/netbook/shell/plasmaapp.cpp #1109720:1109721
@@ -567,13 +567,14 @@
 
     int id = viewIds.readEntry(QString::number(containment->id()), defaultId);
 
-    kDebug() << "new containment" << (QObject*)containment << containment->id()<<"view id"<<id;
 
+    kDebug() << "new containment" << (QObject*)containment << containment->id() << "view id" << id;
+
     //is it a desktop -and- is it active?
     if ((m_mainView && id == NetView::mainViewId()) ||
         (containment->containmentType() != Plasma::Containment::PanelContainment &&
          containment->containmentType() != Plasma::Containment::CustomPanelContainment &&
-         !viewIds.exists() && m_mainView->containment() == 0)) {
+         !viewIds.exists() && containment->screen() == 0)) {
         m_mainView->setContainment(containment);
         containment->setScreen(0);
     //is it a panel?