From 5007596741add65d98b3da7ebb64b0ab6af634a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 10 Oct 2007 18:15:19 +0000 Subject: [PATCH] Fix wrong formatting and the errors resulting from it. svn path=/trunk/KDE/kdebase/workspace/; revision=723786 --- sm.cpp | 79 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/sm.cpp b/sm.cpp index 6d41521df7..67bc0b08a2 100644 --- a/sm.cpp +++ b/sm.cpp @@ -205,45 +205,54 @@ SessionInfo* Workspace::takeSessionInfo( Client* c ) // First search ``session'' if (! sessionId.isEmpty() ) { - // look for a real session managed client (algorithm suggested by ICCCM) - foreach( SessionInfo* info, session ) { - if ( realInfo ) - break; - if ( info->sessionId == sessionId && sessionInfoWindowTypeMatch( c, info )) - { - if ( ! windowRole.isEmpty() ) - { - if ( info->windowRole == windowRole ) - realInfo = info; - session.removeAll(info); - } - else - { - if ( info->windowRole.isEmpty() && - info->resourceName == resourceName && - info->resourceClass == resourceClass ) - realInfo = info; - session.removeAll(info); - } - } - } + // look for a real session managed client (algorithm suggested by ICCCM) + foreach( SessionInfo* info, session ) + { + if( realInfo ) + break; + if( info->sessionId == sessionId && sessionInfoWindowTypeMatch( c, info )) + { + if( ! windowRole.isEmpty() ) + { + if( info->windowRole == windowRole ) + { + realInfo = info; + session.removeAll(info); + } + } + else + { + if( info->windowRole.isEmpty() + && info->resourceName == resourceName + && info->resourceClass == resourceClass ) + { + realInfo = info; + session.removeAll(info); + } + } + } + } } else { - // look for a sessioninfo with matching features. - foreach( SessionInfo* info, session ) { - if ( realInfo ) break; - if ( info->resourceName == resourceName && - info->resourceClass == resourceClass && - info->wmClientMachine == wmClientMachine && - sessionInfoWindowTypeMatch( c, info )) - if ( wmCommand.isEmpty() || info->wmCommand == wmCommand ) { - realInfo = info; - session.removeAll( info ); - } - } + // look for a sessioninfo with matching features. + foreach( SessionInfo* info, session ) + { + if( realInfo ) + break; + if( info->resourceName == resourceName + && info->resourceClass == resourceClass + && info->wmClientMachine == wmClientMachine + && sessionInfoWindowTypeMatch( c, info )) + { + if ( wmCommand.isEmpty() || info->wmCommand == wmCommand ) + { + realInfo = info; + session.removeAll( info ); + } + } + } } - return realInfo; }