[mutter/wip/nielsdg/remove-clutter-wayland-surface: 1/2] clutter: Remove unused ClutterWaylandSurface
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/nielsdg/remove-clutter-wayland-surface: 1/2] clutter: Remove unused ClutterWaylandSurface
- Date: Tue, 18 Jun 2019 07:54:42 +0000 (UTC)
commit 689c7f4107ac55e81ba7e751b9b0058768ff1ad7
Author: Niels De Graef <niels degraef barco com>
Date: Tue Jun 18 09:01:26 2019 +0200
clutter: Remove unused ClutterWaylandSurface
This allows for some further cleanups, since it is the sole consumer of
some functions in Cogl.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/624
clutter/clutter/meson.build | 6 -
clutter/clutter/wayland/clutter-wayland-surface.c | 654 ----------------------
clutter/clutter/wayland/clutter-wayland-surface.h | 117 ----
src/wayland/meta-wayland-surface.c | 1 -
src/wayland/meta-wayland.c | 1 -
5 files changed, 779 deletions(-)
---
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 6210333a1..9ba49c319 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -343,14 +343,8 @@ if have_native_backend
endif
if have_wayland
- clutter_wayland_nonintrospected_sources = [
- 'wayland/clutter-wayland-surface.c',
- ]
- clutter_backend_nonintrospected_sources += clutter_wayland_nonintrospected_sources
-
clutter_wayland_private_headers = [
'wayland/clutter-wayland-compositor.h',
- 'wayland/clutter-wayland-surface.h',
]
clutter_backend_private_headers += clutter_wayland_private_headers
endif
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 391bcc6dd..f63d6d876 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -30,7 +30,6 @@
#include "backends/meta-cursor-tracker-private.h"
#include "clutter/clutter.h"
#include "clutter/wayland/clutter-wayland-compositor.h"
-#include "clutter/wayland/clutter-wayland-surface.h"
#include "cogl/cogl-wayland-server.h"
#include "compositor/meta-surface-actor-wayland.h"
#include "compositor/meta-surface-actor.h"
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index a593f0a7b..f6ce88ee6 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -30,7 +30,6 @@
#include "clutter/clutter.h"
#include "clutter/wayland/clutter-wayland-compositor.h"
-#include "clutter/wayland/clutter-wayland-surface.h"
#include "core/main-private.h"
#include "wayland/meta-wayland-data-device.h"
#include "wayland/meta-wayland-dma-buf.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]