From 2c13ae2b590dccaaa0e6bc27542fa48e28763756 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 10 May 2016 15:23:52 +0200 Subject: [PATCH] wayland: Remove unused list from MetaWaylandTablet This object has no concept of focus itself, so the focus_resource_list is unused. --- src/wayland/meta-wayland-tablet.c | 10 +--------- src/wayland/meta-wayland-tablet.h | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/wayland/meta-wayland-tablet.c b/src/wayland/meta-wayland-tablet.c index 20d840c9d..a56f66da7 100644 --- a/src/wayland/meta-wayland-tablet.c +++ b/src/wayland/meta-wayland-tablet.c @@ -48,7 +48,6 @@ meta_wayland_tablet_new (ClutterInputDevice *device, tablet = g_slice_new0 (MetaWaylandTablet); wl_list_init (&tablet->resource_list); - wl_list_init (&tablet->focus_resource_list); tablet->device = device; tablet->tablet_seat = tablet_seat; @@ -119,12 +118,5 @@ struct wl_resource * meta_wayland_tablet_lookup_resource (MetaWaylandTablet *tablet, struct wl_client *client) { - struct wl_resource *resource; - - resource = wl_resource_find_for_client (&tablet->resource_list, client); - - if (!resource) - resource = wl_resource_find_for_client (&tablet->focus_resource_list, client); - - return resource; + return wl_resource_find_for_client (&tablet->resource_list, client); } diff --git a/src/wayland/meta-wayland-tablet.h b/src/wayland/meta-wayland-tablet.h index 18295f49d..344d33fee 100644 --- a/src/wayland/meta-wayland-tablet.h +++ b/src/wayland/meta-wayland-tablet.h @@ -35,7 +35,6 @@ struct _MetaWaylandTablet ClutterInputDevice *device; struct wl_list resource_list; - struct wl_list focus_resource_list; MetaWaylandSurface *current; };