From 5c61b850cf27b42721e5b3a334cb48dc8c918865 Mon Sep 17 00:00:00 2001
From: Chani Armitage <chanika@gmail.com>
Date: Sun, 26 Sep 2010 16:44:07 +0000
Subject: [PATCH] Merge branch 'kwintransient'

svn path=/trunk/KDE/kdebase/workspace/; revision=1179964
---
 manage.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manage.cpp b/manage.cpp
index 9cceb70c26..1149e6c0f7 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -173,7 +173,6 @@ bool Client::manage( Window w, bool isMapped )
         // If this window is transient, ensure that it is opened on the
         // same window as its parent.  this is necessary when an application
         // starts up on a different desktop than is currently displayed
-        //FIXME do the same for activities too
         if( isTransient() )
             {
             ClientList mainclients = mainClients();
@@ -199,6 +198,9 @@ bool Client::manage( Window w, bool isMapped )
                 desk = workspace()->currentDesktop();
             else if( maincl != NULL )
                 desk = maincl->desktop();
+
+            if ( maincl )
+                setOnActivities(maincl->activities());
             }
         if( info->desktop() )
             desk = info->desktop(); // Window had the initial desktop property, force it