From 29b542ae788aa8c444cd898e36ac5effcc49b6a4 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 5 Dec 2022 16:25:07 -0600 Subject: spi_controller_register_device_listener() - remove the case for SPI_DEVICE_TYPE_MOUSE The only place where spi_controller_register_device_listener() is called is from impl_register_keystroke_listener(), but that function only ever creates listeners of type SPI_DEVICE_TYPE_MOUSE. Along with that, remove the SPI_DEVICE_TYPE_MOUSE enum variant as well, leaving only SPI_DEVICE_TYPE_KBD. This will let us remove a bunch of code related to mouse_listeners, which is not used. --- registryd/deviceeventcontroller.c | 15 +-------------- registryd/deviceeventcontroller.h | 1 - 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'registryd') diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 617e2ca3..4ecaa2a2 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -827,21 +827,8 @@ spi_controller_register_device_listener (SpiDEController *controller, if (retval) notify_keystroke_listener (controller, key_listener, TRUE); break; - case SPI_DEVICE_TYPE_MOUSE: - controller->mouse_listeners = g_list_prepend (controller->mouse_listeners, listener); - if (!controller->have_mouse_listener) - { - controller->have_mouse_listener = TRUE; - if (!controller->have_mouse_event_listener) { - guint id; - id = g_timeout_add (100, spi_dec_poll_mouse_idle, controller); - g_source_set_name_by_id (id, "[at-spi2-core] spi_dec_poll_mouse_idle"); - } - } - spi_dbus_add_disconnect_match (controller->bus, listener->bus_name); - notify_mouse_listener (controller, listener, TRUE); - break; default: + g_assert_not_reached (); break; } return FALSE; diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h index eed443f8..53b17da1 100644 --- a/registryd/deviceeventcontroller.h +++ b/registryd/deviceeventcontroller.h @@ -59,7 +59,6 @@ struct _SpiDEController { typedef enum { SPI_DEVICE_TYPE_KBD, - SPI_DEVICE_TYPE_MOUSE, SPI_DEVICE_TYPE_LAST_DEFINED } SpiDeviceTypeCategory; -- cgit v1.2.1