[mutter/wip/surface-content: 4/8] window-actor: Never unredirect when under Wayland

[Jasper St. Pierre <jstpierre src gnome org>]

commit 812c7b8348f7e42803cdaefd0d612c59adcc8941
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Dec 6 12:28:52 2013 -0500

    window-actor: Never unredirect when under Wayland

 src/compositor/meta-window-actor.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 4047a80..61c1a9e 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -1398,6 +1398,9 @@ meta_window_actor_should_unredirect (MetaWindowActor *self)
   MetaWindow *metaWindow = meta_window_actor_get_meta_window (self);
   MetaWindowActorPrivate *priv = self->priv;
 
+  if (meta_is_wayland_compositor ())
+    return FALSE;
+
   if (meta_window_requested_dont_bypass_compositor (metaWindow))
     return FALSE;
 
@@ -1419,7 +1422,7 @@ meta_window_actor_should_unredirect (MetaWindowActor *self)
   if (meta_window_is_override_redirect (metaWindow))
     return TRUE;
 
-  if (!meta_is_wayland_compositor () && priv->does_full_damage)
+  if (priv->does_full_damage)
     return TRUE;
 
   return FALSE;