[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:       2011-01-24 18:53:42
Message-ID: 20110124185342.DBAD5AC8B9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1216779 by mart:

revert last commit: addContainment can fail.
with containment->setScreen(-1) however works as expected since removes the current \
containment from candidates


 M  +3 -3      activity.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/activity.cpp #1216778:1216779
@@ -190,12 +190,12 @@
                 containment->context()->currentActivityId() != m_id) {
                 // we got a containment, but it belongs to some other activity; \
let's unassign it  // from a screen and grab a new one
-                containment->setScreen(0);
-                containment = PlasmaApp::self()->corona()->addContainment(m_plugin);
+                containment->setScreen(-1);
+                containment = \
PlasmaApp::self()->corona()->containmentForScreen(screen, desktop, m_plugin);  
                 if (!containment) {
                     // possibly a plugin failure, let's go for the default
-                    containment = \
PlasmaApp::self()->corona()->addContainment("default"); +                    \
containment = PlasmaApp::self()->corona()->containmentForScreen(screen, desktop, \
"default");  }
 
                 if (containment) {


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