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

backends/barrier: Guard X11 usage

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3540>
This commit is contained in:
Bilal Elmoussaoui 2024-01-22 16:57:04 +01:00 committed by Marge Bot
parent 8922ada681
commit b6f38b21b7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backends/meta-barrier.c
View File

@ -13,11 +13,14 @@
#include <glib-object.h> #include <glib-object.h>
#include "backends/x11/meta-backend-x11.h"
#include "backends/x11/meta-barrier-x11.h"
#include "meta/meta-enum-types.h" #include "meta/meta-enum-types.h"
#include "meta/util.h" #include "meta/util.h"
#ifdef HAVE_X11
#include "backends/x11/meta-backend-x11.h"
#include "backends/x11/meta-barrier-x11.h"
#endif
#ifdef HAVE_NATIVE_BACKEND #ifdef HAVE_NATIVE_BACKEND
#include "backends/native/meta-backend-native.h" #include "backends/native/meta-backend-native.h"
#include "backends/native/meta-barrier-native.h" #include "backends/native/meta-barrier-native.h"
@ -276,9 +279,11 @@ init_barrier_impl (MetaBarrier *barrier)
if (META_IS_BACKEND_NATIVE (priv->backend)) if (META_IS_BACKEND_NATIVE (priv->backend))
priv->impl = meta_barrier_impl_native_new (barrier); priv->impl = meta_barrier_impl_native_new (barrier);
#endif #endif
#ifdef HAVE_X11
if (META_IS_BACKEND_X11 (priv->backend) && if (META_IS_BACKEND_X11 (priv->backend) &&
!meta_is_wayland_compositor ()) !meta_is_wayland_compositor ())
priv->impl = meta_barrier_impl_x11_new (barrier); priv->impl = meta_barrier_impl_x11_new (barrier);
#endif
g_warn_if_fail (priv->impl); g_warn_if_fail (priv->impl);
} }