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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/shell
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-11-23 20:08:44
Message-ID: 20101123200844.D2483AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1200054 by aseigo:

don't create desktop views for containments that aren't for any screen


 M  +3 -2      plasmaapp.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/plasmaapp.cpp #1200053:1200054
@@ -1012,7 +1012,7 @@
             }
 
             const int screen = containment->screen();
-            if (screen >= Kephal::ScreenUtils::numScreens()) {
+            if (screen >= Kephal::ScreenUtils::numScreens() || screen < 0) {
                 kDebug() << "not creating a view on screen" << screen << "as it does \
not exist";  continue;
             }
@@ -1093,12 +1093,13 @@
 void PlasmaApp::containmentScreenOwnerChanged(int wasScreen, int isScreen, \
Plasma::Containment *containment)  {
     Q_UNUSED(wasScreen)
-    kDebug() << "@@@was" << wasScreen << "is" << isScreen << (QObject*)containment;
+    kDebug() << "@@@was" << wasScreen << "is" << isScreen << (QObject*)containment \
<< m_desktops.count();  
     if (isScreen < 0) {
         kDebug() << "@@@screen<0";
         return;
     }
+
     if (isPanelContainment(containment)) {
         kDebug() << "@@@isPanel";
         return;


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