From 2b2fb47e204b9ac27437fb444a38300bd49eb788 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Tue, 23 Nov 2010 22:21:24 +0000
Subject: [PATCH] clean up a bit

svn path=/trunk/KDE/kdelibs/; revision=1200096
---
 containment.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/containment.cpp b/containment.cpp
index 0776696a9..3423c512d 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -995,10 +995,7 @@ void ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventIn
                          << "desktop" << currently->desktop()
                          << "and is" << currently->activity()
                          << (QObject*)currently << "i'm" << (QObject*)q;
-                //kDebug() << "setScreen due to swap";
-                //make the view completely forget about us
-                emit q->screenChanged(screen, -1, q);
-                currently->setScreen(-1, newDesktop);
+                currently->setScreen(-1, currently->desktop());
                 swapScreensWith = currently;
             }
         }
@@ -1015,11 +1012,14 @@ void ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventIn
     int oldScreen = screen;
     screen = newScreen;
 
-
     q->updateConstraints(Plasma::ScreenConstraint);
 
     if (oldScreen != newScreen || oldDesktop != newDesktop) {
-
+        /*
+        kDebug() << "going to signal change for" << q
+                 << ", old screen & desktop:" << oldScreen << oldDesktop
+                 << ", new:" << screen << desktop;
+                 */
         KConfigGroup c = q->config();
         c.writeEntry("screen", screen);
         c.writeEntry("desktop", desktop);