[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/shell
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-12-10 15:27:43
Message-ID: 20101210152743.E158DAC8A6 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1205248 by mart:

don't steal containments to other activities
BUG:258392
and possibily
CCBUG:258416


 M  +13 -1     activity.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/activity.cpp #1205247:1205248
@@ -172,11 +172,23 @@
             // this allows the corona to either grab one for us that already exists \
                matching
             // screen and desktop, or create a new one. this also works regardless \
                of immutability
             containment = PlasmaApp::self()->corona()->containmentForScreen(screen, \
                desktop, m_plugin);
-            if (!containment) {
+            if (!containment || \
!containment->context()->currentActivityId().isEmpty()) {  // possibly a plugin \
                failure, let's go for the default
                 containment = \
PlasmaApp::self()->corona()->containmentForScreen(screen, desktop, "default");  }
+            //we don't want to steal contaiments from other activities
+            if (!containment || \
!containment->context()->currentActivityId().isEmpty()) { +                // \
possibly a plugin failure, let's go for the default +                containment = \
PlasmaApp::self()->corona()->addContainment(m_plugin); +                \
containment->setScreen(screen, desktop);  }
+            //last hope, create a new one
+            if (!containment) {
+                // possibly a plugin failure, let's go for the default
+                containment = \
PlasmaApp::self()->corona()->addContainment("default"); +                \
containment->setScreen(screen, desktop); +            }
+        }
 
         Q_ASSERT(containment);
         insertContainment(containment, screen, desktop);


[prev in list] [next in list] [prev in thread] [next in thread]