isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 09:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix non-wayland builds

Browse Source 
Add the necessary preprocessor guards that were missed in commits
65e9c89ed9 and 6d64123849 ...

https://bugzilla.gnome.org/show_bug.cgi?id=780533
This commit is contained in:
Chris Vine 2017-03-25 15:24:00 +00:00 committed by Florian Müllner
parent 6883a1f350
commit bff311da88
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compositor/compositor.c
View File

@ -388,7 +388,9 @@ meta_begin_modal_for_plugin (MetaCompositor *compositor,
meta_display_sync_wayland_input_focus (display); meta_display_sync_wayland_input_focus (display);
meta_display_cancel_touch (display); meta_display_cancel_touch (display);
#ifdef HAVE_WAYLAND
meta_dnd_wayland_handle_begin_modal (compositor); meta_dnd_wayland_handle_begin_modal (compositor);
#endif
} }
return TRUE; return TRUE;

2
src/core/main.c
View File

@ -443,11 +443,13 @@ calculate_compositor_configuration (MetaCompositorType *compositor_type,
#endif /* HAVE_WAYLAND */ #endif /* HAVE_WAYLAND */
*compositor_type = META_COMPOSITOR_TYPE_X11; *compositor_type = META_COMPOSITOR_TYPE_X11;
#ifdef HAVE_WAYLAND
if (opt_nested) if (opt_nested)
{ {
*backend_gtype = META_TYPE_BACKEND_X11_NESTED; *backend_gtype = META_TYPE_BACKEND_X11_NESTED;
return; return;
} }
#endif /* HAVE_WAYLAND */
#ifdef HAVE_NATIVE_BACKEND #ifdef HAVE_NATIVE_BACKEND
if (opt_display_server) if (opt_display_server)