diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2019-03-29 21:18:07 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2019-08-24 08:59:08 +0000 |
| commit | c710a569033bbd9327eede901b6f7bf2dce710a6 (patch) | |
| tree | 111bb74be25ee55cf62d386fd94c83dc69daa696 /src | |
| parent | 96d5bde9b760ecec43a806fc03356d0c26089115 (diff) | |
| download | mutter-c710a569033bbd9327eede901b6f7bf2dce710a6.tar.gz | |
backends: Move nested stage to src/backends/x11/nested
We now have a MetaStageX11, so it's extra confusing to have both in
the same directory.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/672
Diffstat (limited to 'src')
| -rw-r--r-- | src/backends/x11/meta-clutter-backend-x11.c | 2 | ||||
| -rw-r--r-- | src/backends/x11/nested/meta-stage-x11-nested.c (renamed from src/backends/x11/meta-stage-x11-nested.c) | 2 | ||||
| -rw-r--r-- | src/backends/x11/nested/meta-stage-x11-nested.h (renamed from src/backends/x11/meta-stage-x11-nested.h) | 2 | ||||
| -rw-r--r-- | src/meson.build | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/backends/x11/meta-clutter-backend-x11.c b/src/backends/x11/meta-clutter-backend-x11.c index 05af25c90..8d4b64b03 100644 --- a/src/backends/x11/meta-clutter-backend-x11.c +++ b/src/backends/x11/meta-clutter-backend-x11.c @@ -31,8 +31,8 @@ #include "backends/x11/meta-clutter-backend-x11.h" #include "backends/x11/meta-device-manager-x11.h" #include "backends/x11/meta-keymap-x11.h" -#include "backends/x11/meta-stage-x11-nested.h" #include "backends/x11/meta-xkb-a11y-x11.h" +#include "backends/x11/nested/meta-stage-x11-nested.h" #include "clutter/clutter-mutter.h" #include "clutter/clutter.h" #include "core/bell.h" diff --git a/src/backends/x11/meta-stage-x11-nested.c b/src/backends/x11/nested/meta-stage-x11-nested.c index f6dc5dbcb..73b8f2854 100644 --- a/src/backends/x11/meta-stage-x11-nested.c +++ b/src/backends/x11/nested/meta-stage-x11-nested.c @@ -24,7 +24,7 @@ #include "config.h" -#include "backends/x11/meta-stage-x11-nested.h" +#include "backends/x11/nested/meta-stage-x11-nested.h" #include "backends/meta-backend-private.h" #include "backends/meta-crtc.h" diff --git a/src/backends/x11/meta-stage-x11-nested.h b/src/backends/x11/nested/meta-stage-x11-nested.h index b605e07e2..76678465b 100644 --- a/src/backends/x11/meta-stage-x11-nested.h +++ b/src/backends/x11/nested/meta-stage-x11-nested.h @@ -26,7 +26,7 @@ #define META_STAGE_X11_NESTED_H #include "clutter/clutter-mutter.h" -#include "meta-stage-x11.h" +#include "backends/x11/meta-stage-x11.h" #define META_TYPE_STAGE_X11_NESTED (meta_stage_x11_nested_get_type ()) G_DECLARE_FINAL_TYPE (MetaStageX11Nested, meta_stage_x11_nested, diff --git a/src/meson.build b/src/meson.build index e5fafc6dc..2aff56146 100644 --- a/src/meson.build +++ b/src/meson.build @@ -264,8 +264,6 @@ mutter_sources = [ 'backends/x11/meta-renderer-x11.h', 'backends/x11/meta-stage-x11.c', 'backends/x11/meta-stage-x11.h', - 'backends/x11/meta-stage-x11-nested.c', - 'backends/x11/meta-stage-x11-nested.h', 'backends/x11/meta-virtual-input-device-x11.c', 'backends/x11/meta-virtual-input-device-x11.h', 'backends/x11/meta-xkb-a11y-x11.c', @@ -274,6 +272,8 @@ mutter_sources = [ 'backends/x11/nested/meta-backend-x11-nested.h', 'backends/x11/nested/meta-cursor-renderer-x11-nested.c', 'backends/x11/nested/meta-cursor-renderer-x11-nested.h', + 'backends/x11/nested/meta-stage-x11-nested.c', + 'backends/x11/nested/meta-stage-x11-nested.h', 'backends/x11/nested/meta-renderer-x11-nested.c', 'backends/x11/nested/meta-renderer-x11-nested.h', 'compositor/clutter-utils.c', |