dont use the keepBorder option for mwm hinted windows after all, but do honor the...

diff --git a/openbox/client.c b/openbox/client.c
index 457a0f6ad03e2292406335d7d49d552b20cf5fb2..474176888b784f03aeda80c88ad3ffaa884b3417 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1303,9 +1303,12 @@ void client_setup_decor_and_functions(ObClient *self)
             if (! ((self->mwmhints.decorations & OB_MWM_DECOR_HANDLE) ||
                    (self->mwmhints.decorations & OB_MWM_DECOR_TITLE)))
                 /* if the mwm hints request no handle or title, then all
-                   decorations are disabled */
-                self->decorations = config_theme_keepborder ?
-                    self->decorations & OB_FRAME_DECOR_BORDER : 0;
+                   decorations are disabled, but keep the border if that's
+                   specified */
+                if (self->mwmhints.decorations & OB_MWM_DECOR_BORDER)
+                    self->decorations = OB_FRAME_DECOR_BORDER;
+                else
+                    self->decorations = 0;
         }
     }