Merging from old trunk:

r625469 | hermier | 2007-01-20 10:56:57 +0100 (Sat, 20 Jan 2007) | 1 line

#625468 ported to KDE4


svn path=/trunk/KDE/kdebase/workspace/; revision=659525

geometry.cpp

@@ -223,7 +223,7 @@ QRect Workspace::clientArea( clientAreaOption opt, const QPoint& p, int desktop
     if( desktop == NETWinInfo::OnAllDesktops || desktop == 0 )
         desktop = currentDesktop();
     QDesktopWidget *desktopwidget = KApplication::desktop();
-    int screen = desktopwidget->screenNumber( p );
+    int screen = desktopwidget->isVirtualDesktop() ? desktopwidget->screenNumber( p ) : desktopwidget->primaryScreen();
     if( screen < 0 )
         screen = desktopwidget->primaryScreen();
     QRect sarea = screenarea // may be NULL during KWin initialization