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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kwin
From:       Chani Armitage <chanika () gmail ! com>
Date:       2010-09-26 16:44:08
Message-ID: 20100926164408.05AB5AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1179964 by chani:

Merge branch 'kwintransient'

 M  +3 -1      manage.cpp  


--- trunk/KDE/kdebase/workspace/kwin/manage.cpp #1179963:1179964
@@ -173,7 +173,6 @@
         // 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 @@
                 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
[prev in list] [next in list] [prev in thread] [next in thread]