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

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/taskmanager
From:       Carlo Segato <brandon.ml () gmail ! com>
Date:       2010-12-21 22:39:41
Message-ID: 20101221223941.C8CBBAC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1208484 by segato:

move refereshActivities() from task.cpp to task_x11.cpp and add a stub version in task_win.cpp

 M  +0 -13     task.cpp  
 M  +5 -0      task_win.cpp  
 M  +12 -0     task_x11.cpp  


--- trunk/KDE/kdebase/workspace/libs/taskmanager/task.cpp #1208483:1208484
@@ -31,7 +31,6 @@
 #include <QTimer>
 #include <QApplication>
 #include <QDesktopWidget>
-#include <QtGui/QX11Info>
 
 // KDE
 #include <KDebug>
@@ -674,18 +673,6 @@
     return d->activities;
 }
 
-void Task::refreshActivities()
-{
-    unsigned long properties[] = { 0, NET::WM2Activities };
-    NETWinInfo info(QX11Info::display(), d->win, QX11Info::appRootWindow(), properties, 2);
-    QString result(info.activities());
-    if (result.isEmpty() || result == "ALL") {
-        d->activities.clear();
-    } else {
-        d->activities = result.split(',');
-    }
-}
-
 /*
     QStringList newActivitiesList;
     Atom type;
--- trunk/KDE/kdebase/workspace/libs/taskmanager/task_win.cpp #1208483:1208484
@@ -167,4 +167,9 @@
     d->iconGeometry = rect;
 }
 
+void Task::refreshActivities()
+{
+    return;
+}
+
 } // TaskManager namespace
--- trunk/KDE/kdebase/workspace/libs/taskmanager/task_x11.cpp #1208483:1208484
@@ -276,4 +276,16 @@
     ni.setIconGeometry(r);
 }
 
+void Task::refreshActivities()
+{
+    unsigned long properties[] = { 0, NET::WM2Activities };
+    NETWinInfo info(QX11Info::display(), d->win, QX11Info::appRootWindow(), properties, 2);
+    QString result(info.activities());
+    if (result.isEmpty() || result == "ALL") {
+        d->activities.clear();
+    } else {
+        d->activities = result.split(',');
+    }
+}
+
 } // namespace
[prev in list] [next in list] [prev in thread] [next in thread]