1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00

Fix KDE bug 124826.

Obtained from: KDE SVN, Aron Stansvik <elvstone@gmail.com>
This commit is contained in:
Michael Nottebrock 2006-04-07 18:59:07 +00:00
parent 87052fc3c4
commit b1c0b50cc8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=159072
14 changed files with 147 additions and 0 deletions

View File

@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -0,0 +1,20 @@
--- kwin/tabbox.cpp 2006/03/17 21:38:24 519807
+++ kwin/tabbox.cpp 2006/04/03 13:05:18 525954
@@ -1152,7 +1152,7 @@
*/
Client* Workspace::nextFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );
@@ -1170,7 +1170,7 @@
*/
Client* Workspace::previousFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );

View File

@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -0,0 +1,20 @@
--- kwin/tabbox.cpp 2006/03/17 21:38:24 519807
+++ kwin/tabbox.cpp 2006/04/03 13:05:18 525954
@@ -1152,7 +1152,7 @@
*/
Client* Workspace::nextFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );
@@ -1170,7 +1170,7 @@
*/
Client* Workspace::previousFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );

View File

@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -0,0 +1,20 @@
--- kwin/tabbox.cpp 2006/03/17 21:38:24 519807
+++ kwin/tabbox.cpp 2006/04/03 13:05:18 525954
@@ -1152,7 +1152,7 @@
*/
Client* Workspace::nextFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );
@@ -1170,7 +1170,7 @@
*/
Client* Workspace::previousFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );

View File

@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -0,0 +1,20 @@
--- kwin/tabbox.cpp 2006/03/17 21:38:24 519807
+++ kwin/tabbox.cpp 2006/04/03 13:05:18 525954
@@ -1152,7 +1152,7 @@
*/
Client* Workspace::nextFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );
@@ -1170,7 +1170,7 @@
*/
Client* Workspace::previousFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );

View File

@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -0,0 +1,20 @@
--- kwin/tabbox.cpp 2006/03/17 21:38:24 519807
+++ kwin/tabbox.cpp 2006/04/03 13:05:18 525954
@@ -1152,7 +1152,7 @@
*/
Client* Workspace::nextFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );
@@ -1170,7 +1170,7 @@
*/
Client* Workspace::previousFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );

View File

@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -0,0 +1,20 @@
--- kwin/tabbox.cpp 2006/03/17 21:38:24 519807
+++ kwin/tabbox.cpp 2006/04/03 13:05:18 525954
@@ -1152,7 +1152,7 @@
*/
Client* Workspace::nextFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );
@@ -1170,7 +1170,7 @@
*/
Client* Workspace::previousFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );

View File

@ -8,6 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -0,0 +1,20 @@
--- kwin/tabbox.cpp 2006/03/17 21:38:24 519807
+++ kwin/tabbox.cpp 2006/04/03 13:05:18 525954
@@ -1152,7 +1152,7 @@
*/
Client* Workspace::nextFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );
@@ -1170,7 +1170,7 @@
*/
Client* Workspace::previousFocusChainClient( Client* c ) const
{
- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop();
+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop();
if ( focus_chain[desktop].isEmpty() )
return 0;
ClientList::ConstIterator it = focus_chain[desktop].find( c );