From 5af9e44aa66d6c6b12b2d3db5273430f5bd578b3 Mon Sep 17 00:00:00 2001
From: Matthias Ettrich <ettrich@troll.no>
Date: Sat, 2 Mar 2002 21:18:45 +0000
Subject: [PATCH] be more conservative with not stealing focus, basically do
 not not steal focus for transient windows.

There have been issues with some konqueror dialogs on some machines, and
this is the safest solution for now.

svn path=/trunk/kdebase/kwin/; revision=140339
---
 client.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client.cpp b/client.cpp
index f317f571f8..65263112ae 100644
--- a/client.cpp
+++ b/client.cpp
@@ -848,9 +848,8 @@ bool Client::manage( bool isMapped, bool doNotShow, bool isInitial )
             // window does not stem from a restored session.
             Client* ac = workspace()->activeClient();
 
-            if ( !session && ac && !ac->isDesktop() &&
-		 ac->userTime() > userTime() && 
-		 ( !isTransient() || mainClient() != ac ) ) {
+            if ( !isTransient() && !session && ac && !ac->isDesktop() &&
+		 ac->userTime() > userTime() ) {
                 workspace()->stackClientUnderActive( this );
                 show();
             } else {