Merge branch 'KDE/4.10'

client.cpp

@@ -1574,6 +1574,7 @@ void Client::updateActivities(bool includeTransients)
         m_blockedActivityUpdatesRequireTransients |= includeTransients;
         return;
     }
+    emit activitiesChanged(this);
     m_blockedActivityUpdatesRequireTransients = false; // reset
     if (includeTransients)
         workspace()->updateOnAllActivitiesOfTransients(this);

toplevel.h

@@ -152,7 +152,7 @@ class Toplevel
      * See http://standards.freedesktop.org/wm-spec/wm-spec-latest.html .
      */
     Q_PROPERTY(int windowType READ windowType)
-    Q_PROPERTY(QStringList activities READ activities)
+    Q_PROPERTY(QStringList activities READ activities NOTIFY activitiesChanged)
     /**
      * Whether this Toplevel is managed by KWin (it has control over its placement and other
      * aspects, as opposed to override-redirect windows that are entirely handled by the application).
@@ -325,6 +325,7 @@ signals:
      * schedule a repaint of the scene.
      **/
     void needsRepaint();
+    void activitiesChanged(KWin::Toplevel* toplevel);
 
 protected:
     virtual ~Toplevel();