From a32b9ff1e7f5cef5bd8bff1a8da6f87d7954997e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Sat, 22 Mar 2008 14:34:22 +0000
Subject: [PATCH] Don't keep a separate flag for the Motif noborder flag.

svn path=/trunk/KDE/kdebase/workspace/; revision=788801
---
 client.cpp | 6 +++---
 client.h   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/client.cpp b/client.cpp
index 07ae3d59c1..1900dc3f92 100644
--- a/client.cpp
+++ b/client.cpp
@@ -135,7 +135,6 @@ Client::Client( Workspace *ws )
     deleting = false;
     keep_above = false;
     keep_below = false;
-    motif_noborder = false;
     motif_may_move = true;
     motif_may_resize = true;
     motif_may_close = true;
@@ -479,7 +478,7 @@ void Client::resizeDecoration( const QSize& s )
 
 bool Client::noBorder() const
     {
-    return noborder || isFullScreen() || user_noborder || motif_noborder;
+    return noborder || isFullScreen() || user_noborder;
     }
 
 bool Client::userCanSetNoBorder() const
@@ -1446,7 +1445,8 @@ void Client::getMotifHints()
     {
     bool mnoborder, mresize, mmove, mminimize, mmaximize, mclose;
     Motif::readFlags( client, mnoborder, mresize, mmove, mminimize, mmaximize, mclose );
-    motif_noborder = mnoborder;
+    if( mnoborder )
+        noborder = true;
     if( !hasNETSupport()) // NETWM apps should set type and size constraints
         {
         motif_may_resize = mresize; // this should be set using minsize==maxsize, but oh well
diff --git a/client.h b/client.h
index d86bcfcc63..5b744eadd6 100644
--- a/client.h
+++ b/client.h
@@ -447,7 +447,6 @@ class Client
         uint Pping : 1; // does it support _NET_WM_PING?
         uint input :1; // does the window want input in its wm_hints
         uint skip_pager : 1;
-        uint motif_noborder : 1;
         uint motif_may_resize : 1;
         uint motif_may_move :1;
         uint motif_may_close : 1;