From b1c0b50cc83a51140c7f5f564f829029d6974f17 Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Fri, 7 Apr 2006 18:59:07 +0000 Subject: [PATCH] Fix KDE bug 124826. Obtained from: KDE SVN, Aron Stansvik --- x11/kde4-baseapps/Makefile | 1 + x11/kde4-baseapps/files/patch-kwin-tabbox.cpp | 20 +++++++++++++++++++ x11/kde4-runtime/Makefile | 1 + x11/kde4-runtime/files/patch-kwin-tabbox.cpp | 20 +++++++++++++++++++ x11/kde4-workspace/Makefile | 1 + .../files/patch-kwin-tabbox.cpp | 20 +++++++++++++++++++ x11/kdebase3/Makefile | 1 + x11/kdebase3/files/patch-kwin-tabbox.cpp | 20 +++++++++++++++++++ x11/kdebase4-runtime/Makefile | 1 + .../files/patch-kwin-tabbox.cpp | 20 +++++++++++++++++++ x11/kdebase4-workspace/Makefile | 1 + .../files/patch-kwin-tabbox.cpp | 20 +++++++++++++++++++ x11/kdebase4/Makefile | 1 + x11/kdebase4/files/patch-kwin-tabbox.cpp | 20 +++++++++++++++++++ 14 files changed, 147 insertions(+) create mode 100644 x11/kde4-baseapps/files/patch-kwin-tabbox.cpp create mode 100644 x11/kde4-runtime/files/patch-kwin-tabbox.cpp create mode 100644 x11/kde4-workspace/files/patch-kwin-tabbox.cpp create mode 100644 x11/kdebase3/files/patch-kwin-tabbox.cpp create mode 100644 x11/kdebase4-runtime/files/patch-kwin-tabbox.cpp create mode 100644 x11/kdebase4-workspace/files/patch-kwin-tabbox.cpp create mode 100644 x11/kdebase4/files/patch-kwin-tabbox.cpp diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index d5066a5cc0a3..bd713a88e9b6 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -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 diff --git a/x11/kde4-baseapps/files/patch-kwin-tabbox.cpp b/x11/kde4-baseapps/files/patch-kwin-tabbox.cpp new file mode 100644 index 000000000000..1254fc501ed8 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-kwin-tabbox.cpp @@ -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 ); diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index d5066a5cc0a3..bd713a88e9b6 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -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 diff --git a/x11/kde4-runtime/files/patch-kwin-tabbox.cpp b/x11/kde4-runtime/files/patch-kwin-tabbox.cpp new file mode 100644 index 000000000000..1254fc501ed8 --- /dev/null +++ b/x11/kde4-runtime/files/patch-kwin-tabbox.cpp @@ -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 ); diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index d5066a5cc0a3..bd713a88e9b6 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -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 diff --git a/x11/kde4-workspace/files/patch-kwin-tabbox.cpp b/x11/kde4-workspace/files/patch-kwin-tabbox.cpp new file mode 100644 index 000000000000..1254fc501ed8 --- /dev/null +++ b/x11/kde4-workspace/files/patch-kwin-tabbox.cpp @@ -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 ); diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index d5066a5cc0a3..bd713a88e9b6 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -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 diff --git a/x11/kdebase3/files/patch-kwin-tabbox.cpp b/x11/kdebase3/files/patch-kwin-tabbox.cpp new file mode 100644 index 000000000000..1254fc501ed8 --- /dev/null +++ b/x11/kdebase3/files/patch-kwin-tabbox.cpp @@ -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 ); diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index d5066a5cc0a3..bd713a88e9b6 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -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 diff --git a/x11/kdebase4-runtime/files/patch-kwin-tabbox.cpp b/x11/kdebase4-runtime/files/patch-kwin-tabbox.cpp new file mode 100644 index 000000000000..1254fc501ed8 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-kwin-tabbox.cpp @@ -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 ); diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index d5066a5cc0a3..bd713a88e9b6 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -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 diff --git a/x11/kdebase4-workspace/files/patch-kwin-tabbox.cpp b/x11/kdebase4-workspace/files/patch-kwin-tabbox.cpp new file mode 100644 index 000000000000..1254fc501ed8 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-kwin-tabbox.cpp @@ -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 ); diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index d5066a5cc0a3..bd713a88e9b6 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -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 diff --git a/x11/kdebase4/files/patch-kwin-tabbox.cpp b/x11/kdebase4/files/patch-kwin-tabbox.cpp new file mode 100644 index 000000000000..1254fc501ed8 --- /dev/null +++ b/x11/kdebase4/files/patch-kwin-tabbox.cpp @@ -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 );