[metacity] window: use a consistent mapping from frame_type => decorated

[Alberts Muktupāvels <muktupavels src gnome org>]

commit cebcac8073272a1d32ba469dba15736a3d2fb7cd
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Mon Oct 17 11:42:35 2011 -0400

    window: use a consistent mapping from frame_type => decorated
    
    If a window had a type hint intended for override-redirect windows
    like NOTIFICATION, we ended up with a window that was decorated but
    with a frame type of FRAME_TYPE_LAST, causing assertion failures.
    Fix this by making recalc_window_features() just call
    meta_window_get_frame_type().
    
    https://bugzilla.gnome.org/show_bug.cgi?id=599988

 src/core/window.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/core/window.c b/src/core/window.c
index c53be0b..3b4075b 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -6711,10 +6711,8 @@ recalc_window_features (MetaWindow *window)
       window->override_redirect)
     window->always_sticky = TRUE;
 
-  if (window->type == META_WINDOW_DESKTOP ||
-      window->type == META_WINDOW_DOCK ||
-      window->type == META_WINDOW_SPLASHSCREEN ||
-      window->override_redirect)
+  if (window->override_redirect ||
+      meta_window_get_frame_type (window) == META_FRAME_TYPE_LAST)
     {
       window->decorated = FALSE;
       window->has_close_func = FALSE;