brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Fix non-wayland build

Browse Source 
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
This commit is contained in:
Ting-Wei Lan 2015-09-08 01:50:03 +08:00
parent 6ea7fa9973
commit 5066eaf691
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backends/x11/meta-backend-x11.c
View File

@ -40,8 +40,10 @@
#include "meta-idle-monitor-xsync.h" #include "meta-idle-monitor-xsync.h"
#include "meta-monitor-manager-xrandr.h" #include "meta-monitor-manager-xrandr.h"
#include "backends/meta-monitor-manager-dummy.h" #include "backends/meta-monitor-manager-dummy.h"
#include "wayland/meta-wayland.h"
#include "meta-cursor-renderer-x11.h" #include "meta-cursor-renderer-x11.h"
#ifdef HAVE_WAYLAND
#include "wayland/meta-wayland.h"
#endif
#include <meta/util.h> #include <meta/util.h>
#include "display-private.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) if (priv->mode == META_BACKEND_X11_MODE_NESTED && event->type == FocusIn)
{ {
#ifdef HAVE_WAYLAND
Window xwin = meta_backend_x11_get_xwindow(x11); Window xwin = meta_backend_x11_get_xwindow(x11);
XEvent xev; XEvent xev;
@ -283,6 +286,9 @@ handle_host_xevent (MetaBackend *backend,
MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default (); MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
meta_wayland_compositor_update_key_state (compositor, xev.xkeymap.key_vector, 32, 8); 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)) if (event->type == (priv->xsync_event_base + XSyncAlarmNotify))