Use wlr_list for paths, and improve inert resource handling

2 files changed, 4 insertions, 7 deletions

diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h
index ec291c75..23ac464d 100644
--- a/include/wlr/types/wlr_tablet_pad.h
+++ b/include/wlr/types/wlr_tablet_pad.h
@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <wayland-server.h>
 #include <wlr/types/wlr_input_device.h>
+#include <wlr/types/wlr_list.h>
 
 /*
  * NOTE: the wlr tablet pad implementation does not currently support tablets
@@ -28,7 +29,7 @@ struct wlr_tablet_pad {
 	size_t strip_count;
 
 	struct wl_list groups; // wlr_tablet_pad_group::link
-	struct wl_list paths; // wlr_tablet_path::link
+	struct wlr_list paths; // char *
 
 	void *data;
 };
diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h
index 114ce98a..71fa0f82 100644
--- a/include/wlr/types/wlr_tablet_tool.h
+++ b/include/wlr/types/wlr_tablet_tool.h
@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <wayland-server.h>
 #include <wlr/types/wlr_input_device.h>
+#include <wlr/types/wlr_list.h>
 
 /*
  * Copy+Paste from libinput, but this should neither use libinput, nor
@@ -42,11 +43,6 @@ struct wlr_tablet_tool_tool {
 
 struct wlr_tablet_tool_impl;
 
-struct wlr_tablet_path {
-	struct wl_list link;
-	char *path;
-};
-
 struct wlr_tablet_tool {
 	struct wlr_tablet_tool_impl *impl;
 
@@ -58,7 +54,7 @@ struct wlr_tablet_tool {
 	} events;
 
 	const char *name;
-	struct wl_list paths; // wlr_table_path::link
+	struct wlr_list paths; // char *
 
 	void *data;
 };