Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > 00483d81de16d6155bb71015324df6f6 > files > 30

kdebase4-workspace-4.6.5-1.3.mga1.src.rpm

commit 65078faf106d16106bf8bd00706d23fd3e5263a5
Author: Aaron Seigo <aseigo@kde.org>
Date:   Mon Jul 18 15:15:39 2011 +0200

    sometimes this bit of code is causing issues, and KWindowSystem has a more comprehensive implementation for this, so use that instead
    
    BUG:275614

diff --git a/libs/taskmanager/task_x11.cpp b/libs/taskmanager/task_x11.cpp
index 2dce892..04af0c7 100644
--- a/libs/taskmanager/task_x11.cpp
+++ b/libs/taskmanager/task_x11.cpp
@@ -190,19 +190,18 @@ void Task::close()
 
 void Task::toDesktop(int desk)
 {
-    NETWinInfo ni(QX11Info::display(), d->win, QX11Info::appRootWindow(), NET::WMDesktop);
     if (desk == 0) {
         if (isOnAllDesktops()) {
-            ni.setDesktop(KWindowSystem::currentDesktop());
+            KWindowSystem::setOnDesktop(d->win, KWindowSystem::currentDesktop());
             KWindowSystem::forceActiveWindow(d->win);
         } else {
-            ni.setDesktop(NETWinInfo::OnAllDesktops);
+            KWindowSystem::setOnAllDesktops(d->win, true);
         }
 
         return;
     }
 
-    ni.setDesktop(desk);
+    KWindowSystem::setOnDesktop(d->win, desk);
 
     if (desk == KWindowSystem::currentDesktop()) {
         KWindowSystem::forceActiveWindow(d->win);