/[KDE]/branches/KDE/4.4/kdebase/workspace/plasma/netbook/shell/plasmaapp.cpp

Diff of /branches/KDE/4.4/kdebase/workspace/plasma/netbook/shell/plasmaapp.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1109720, Tue Mar 30 22:05:33 2010 UTC revision 1109721, Wed Mar 31 21:28:15 2010 UTC
# Line 567  void PlasmaApp::createView(Plasma::Conta Line 567  void PlasmaApp::createView(Plasma::Conta
567    
568      int id = viewIds.readEntry(QString::number(containment->id()), defaultId);      int id = viewIds.readEntry(QString::number(containment->id()), defaultId);
569    
570      kDebug() << "new containment" << (QObject*)containment << containment->id()<<"view id"<<id;  
571        kDebug() << "new containment" << (QObject*)containment << containment->id() << "view id" << id;
572    
573      //is it a desktop -and- is it active?      //is it a desktop -and- is it active?
574      if ((m_mainView && id == NetView::mainViewId()) ||      if ((m_mainView && id == NetView::mainViewId()) ||
575          (containment->containmentType() != Plasma::Containment::PanelContainment &&          (containment->containmentType() != Plasma::Containment::PanelContainment &&
576           containment->containmentType() != Plasma::Containment::CustomPanelContainment &&           containment->containmentType() != Plasma::Containment::CustomPanelContainment &&
577           !viewIds.exists() && m_mainView->containment() == 0)) {           !viewIds.exists() && containment->screen() == 0)) {
578          m_mainView->setContainment(containment);          m_mainView->setContainment(containment);
579          containment->setScreen(0);          containment->setScreen(0);
580      //is it a panel?      //is it a panel?
Legend:
Removed from v.1109720  
changed lines
  Added in v.1109721