From 3d3c5fa658538b512573352c69c85a00f39250f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Thu, 5 Sep 2002 07:57:53 +0000
Subject: [PATCH] Fix #47434 .

svn path=/trunk/kdebase/kwin/; revision=175815
---
 client.cpp    | 3 +--
 workspace.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/client.cpp b/client.cpp
index e14364a9ab..631b47087b 100644
--- a/client.cpp
+++ b/client.cpp
@@ -2635,8 +2635,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
     case Options::MouseOperationsMenu:
         if ( isActive() & ( options->focusPolicy != Options::ClickToFocus &&  options->clickRaise ) )
             autoRaise();
-        workspace()->clientPopup( this )->exec( globalPos );
-        workspace()->requestFocus( this );
+        workspace()->showWindowMenu( globalPos, this );
         break;
     case Options::MouseToggleRaiseAndLower:
         if ( workspace()->topClientOnDesktop() == this )
diff --git a/workspace.cpp b/workspace.cpp
index 40a11e6776..2714c1d07c 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1670,8 +1670,12 @@ void Workspace::clientHidden( Client* c )
 
 
 // KDE4 - remove the unused argument
-QPopupMenu* Workspace::clientPopup( Client* )
+QPopupMenu* Workspace::clientPopup( Client* cl )
 {
+    if( cl != active_client ) {
+        kdWarning( 1212 ) << "Using Workspace::clientPopup() with an argument is deprecated" << endl;
+        activateClient( cl );
+    }
     return clientPopup();
 }