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

backends: Move nested stage to src/backends/x11/nested

Browse Source 
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
This commit is contained in:
Carlos Garnacho 2019-03-29 21:18:07 +01:00 committed by Jonas Ådahl
parent 96d5bde9b7
commit c710a56903
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/x11/meta-clutter-backend-x11.c
View File

@ -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"

2
src/backends/x11/meta-stage-x11-nested.c → src/backends/x11/nested/meta-stage-x11-nested.c
View File

@ -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"

2
src/backends/x11/meta-stage-x11-nested.h → src/backends/x11/nested/meta-stage-x11-nested.h
View File

@ -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,

4
src/meson.build
View File

@ -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',