[mutter] build: Fix non-wayland build



commit 5066eaf691cbd34a05d9204ddcbf10d9ee537bcc
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Tue Sep 8 01:50:03 2015 +0800

    build: Fix non-wayland build
    
    This fixes build error caused by commit 614d6bd. We can simply remove
    the usage of meta-wayland.c functions in non-wayland build because
    META_BACKEND_X11_MODE_NESTED is only used in wayland.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753948

 src/backends/x11/meta-backend-x11.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
index 641fb8e..e7b4917 100644
--- a/src/backends/x11/meta-backend-x11.c
+++ b/src/backends/x11/meta-backend-x11.c
@@ -40,8 +40,10 @@
 #include "meta-idle-monitor-xsync.h"
 #include "meta-monitor-manager-xrandr.h"
 #include "backends/meta-monitor-manager-dummy.h"
-#include "wayland/meta-wayland.h"
 #include "meta-cursor-renderer-x11.h"
+#ifdef HAVE_WAYLAND
+#include "wayland/meta-wayland.h"
+#endif
 
 #include <meta/util.h>
 #include "display-private.h"
@@ -272,6 +274,7 @@ handle_host_xevent (MetaBackend *backend,
 
   if (priv->mode == META_BACKEND_X11_MODE_NESTED && event->type == FocusIn)
     {
+#ifdef HAVE_WAYLAND
       Window xwin = meta_backend_x11_get_xwindow(x11);
       XEvent xev;
 
@@ -283,6 +286,9 @@ handle_host_xevent (MetaBackend *backend,
           MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
           meta_wayland_compositor_update_key_state (compositor, xev.xkeymap.key_vector, 32, 8);
         }
+#else
+      g_assert_not_reached ();
+#endif
     }
 
   if (event->type == (priv->xsync_event_base + XSyncAlarmNotify))


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