From 0bf5c831d548312b2e4c56c7b5279bae20da2a88 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 22 Apr 2014 18:18:57 -0400 Subject: [PATCH] wayland: Remove unused list of surfaces --- src/wayland/meta-wayland-private.h | 1 - src/wayland/meta-wayland-surface.c | 2 -- src/wayland/meta-wayland.c | 10 +++------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/wayland/meta-wayland-private.h b/src/wayland/meta-wayland-private.h index d575e2f0c..76f2f06f4 100644 --- a/src/wayland/meta-wayland-private.h +++ b/src/wayland/meta-wayland-private.h @@ -79,7 +79,6 @@ struct _MetaWaylandCompositor ClutterActor *stage; GHashTable *outputs; GSource *wayland_event_source; - GList *surfaces; struct wl_list frame_callbacks; MetaXWaylandManager xwayland_manager; diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index f64f4fab3..e9f68e725 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -554,8 +554,6 @@ wl_surface_destructor (struct wl_resource *resource) if (surface->window) destroy_window (surface); - compositor->surfaces = g_list_remove (compositor->surfaces, surface); - surface_set_buffer (surface, NULL); pending_state_destroy (&surface->pending); diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c index 6ccb3234a..0cced23e6 100644 --- a/src/wayland/meta-wayland.c +++ b/src/wayland/meta-wayland.c @@ -205,14 +205,10 @@ meta_wayland_compositor_create_surface (struct wl_client *wayland_client, { MetaWaylandCompositor *compositor = wl_resource_get_user_data (wayland_compositor_resource); - MetaWaylandSurface *surface; - surface = meta_wayland_surface_create (compositor, - wayland_client, id, - MIN (META_WL_SURFACE_VERSION, - wl_resource_get_version (wayland_compositor_resource))); - - compositor->surfaces = g_list_prepend (compositor->surfaces, surface); + meta_wayland_surface_create (compositor, wayland_client, id, + MIN (META_WL_SURFACE_VERSION, + wl_resource_get_version (wayland_compositor_resource))); } static void