[mutter] compositor: Conditionalize some more Wayland support



commit 2f9840a51cc527cfc5c0727f458825cc94620d47
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Aug 27 12:56:05 2014 -0400

    compositor: Conditionalize some more Wayland support

 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 1885d87..8043157 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -406,9 +406,12 @@ meta_window_actor_update_surface (MetaWindowActor *self)
   MetaWindow *window = priv->window;
   MetaSurfaceActor *surface_actor;
 
+#ifdef HAVE_WAYLAND
   if (window->surface)
     surface_actor = window->surface->surface_actor;
-  else if (!meta_is_wayland_compositor ())
+  else
+#endif
+  if (!meta_is_wayland_compositor ())
     surface_actor = meta_surface_actor_x11_new (window);
   else
     surface_actor = NULL;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]