From 787ef1a25ff5cabb153e674a92febdf8cbd9d7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <kde@martin-graesslin.com>
Date: Thu, 12 Aug 2010 16:26:29 +0000
Subject: [PATCH] Forward port rev 1162775: Include the first desktop window
 which is on current desktop in tabbox. This fixes a bug that tabbox switches
 to a random desktop if there is a desktop window on each virtual desktop. If
 there is only one desktop window it is on all virtual desktops and will be
 used. If there is one desktop window per virtual desktop only that one will
 be used. CCBUG: 247532

svn path=/trunk/KDE/kdebase/workspace/; revision=1162777
---
 tabbox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tabbox.cpp b/tabbox.cpp
index d66d243e5f..98aa182d3e 100644
--- a/tabbox.cpp
+++ b/tabbox.cpp
@@ -185,7 +185,7 @@ TabBoxClient* TabBoxHandlerImpl::desktopClient() const
     {
     foreach( const Client* client, Workspace::self()->stackingOrder() )
         {
-        if( client->isDesktop() )
+        if( client->isDesktop() && client->isOnCurrentDesktop() )
             {
             return client->tabBoxClient();
             }