diff --git a/src/core/edge-resistance.c b/src/compositor/edge-resistance.c similarity index 99% rename from src/core/edge-resistance.c rename to src/compositor/edge-resistance.c index 073ea54bc..06ed81a5e 100644 --- a/src/core/edge-resistance.c +++ b/src/compositor/edge-resistance.c @@ -21,7 +21,7 @@ #include "config.h" -#include "core/edge-resistance.h" +#include "compositor/edge-resistance.h" #include "compositor/compositor-private.h" #include "core/boxes-private.h" diff --git a/src/core/edge-resistance.h b/src/compositor/edge-resistance.h similarity index 100% rename from src/core/edge-resistance.h rename to src/compositor/edge-resistance.h diff --git a/src/compositor/meta-window-drag.c b/src/compositor/meta-window-drag.c index 2a99704fa..c272ea50d 100644 --- a/src/compositor/meta-window-drag.c +++ b/src/compositor/meta-window-drag.c @@ -24,7 +24,7 @@ #include "meta-window-drag.h" #include "compositor/compositor-private.h" -#include "core/edge-resistance.h" +#include "compositor/edge-resistance.h" #include "core/frame.h" #include "core/window-private.h" #include "meta/meta-enum-types.h" diff --git a/src/core/keybindings.c b/src/core/keybindings.c index f72c8ad30..37033e136 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -36,7 +36,6 @@ #include "backends/x11/meta-backend-x11.h" #include "backends/x11/meta-input-device-x11.h" #include "compositor/compositor-private.h" -#include "core/edge-resistance.h" #include "core/frame.h" #include "core/keybindings-private.h" #include "core/meta-accel-parse.h" diff --git a/src/core/window.c b/src/core/window.c index ceb8f5ac8..a167953a4 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -71,7 +71,6 @@ #include "compositor/compositor-private.h" #include "core/boxes-private.h" #include "core/constraints.h" -#include "core/edge-resistance.h" #include "core/frame.h" #include "core/keybindings-private.h" #include "core/meta-workspace-manager-private.h" diff --git a/src/meson.build b/src/meson.build index 3edc6cf3e..717546f69 100644 --- a/src/meson.build +++ b/src/meson.build @@ -279,6 +279,8 @@ mutter_sources = [ 'compositor/cogl-utils.h', 'compositor/compositor.c', 'compositor/compositor-private.h', + 'compositor/edge-resistance.c', + 'compositor/edge-resistance.h', 'compositor/meta-background-actor.c', 'compositor/meta-background-actor-private.h', 'compositor/meta-background-content.c', @@ -329,8 +331,6 @@ mutter_sources = [ 'core/delete.c', 'core/display.c', 'core/display-private.h', - 'core/edge-resistance.c', - 'core/edge-resistance.h', 'core/events.c', 'core/events.h', 'core/frame.c',